ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -213,6 +213,23 @@ } /** * */ @ApiOperation("æ°å¢åºé¢è®°å½ç»è®°ä¿¡æ¯") @PostMapping("/addOutHospJLInfo") public Map<String, Object> addOutHospJLInfo(@RequestBody Map dataMap) { Boolean aBoolean = true; try { aBoolean = serviceExternalService.addOutHospJLInfo(dataMap); } catch (Exception e) { e.printStackTrace(); log.error("serviceExternal---addOutHospJLInfoï¼{}", e.getMessage()); aBoolean = false; } return returnParam(aBoolean, dataMap); } /** * åæ¶åºé¢ç»è®°ä¿¡æ¯ */ @ApiOperation("åæ¶åºé¢ç»è®°ä¿¡æ¯") @@ -298,6 +315,43 @@ } /** * æ£æ¥ç³è¯·æå¡/æ£æ¥ä¿®æ¹æå¡ */ @ApiOperation("æ£æ¥ç³è¯·æå¡") @PostMapping("/addInspectService") public Map<String, Object> addInspectService(@RequestBody Map dataMap) { Boolean aBoolean = true; try { aBoolean = serviceExternalService.addInspectService(dataMap); } catch (Exception e) { e.printStackTrace(); log.error("serviceExternal---addInspectServiceï¼{}", e.getMessage()); aBoolean = false; } return returnParam(aBoolean, dataMap); } /** * æ£æ¥æ¥åæå¡ */ @ApiOperation("æ£æ¥æ¥åæå¡") @PostMapping("/addInspectBGService") public Map<String, Object> addInspectBGService(@RequestBody Map dataMap) { Boolean aBoolean = true; try { aBoolean = serviceExternalService.addInspectBGService(dataMap); } catch (Exception e) { e.printStackTrace(); log.error("serviceExternal---addInspectBGServiceï¼{}", e.getMessage()); aBoolean = false; } return returnParam(aBoolean, dataMap); } private Map<String, Object> returnParam(Boolean b, Map dataMap) { Map yeWuXX = (Map) dataMap.get("YeWuXX"); String XiaoXiID = (String) yeWuXX.get("XiaoXiID"); smartor/src/main/java/com/smartor/domain/ExternalInspectionDetail.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,86 @@ package com.smartor.domain; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author æ¥æ¶ç¬¬ä¸æ¹æ£æ¥æ¥å详ç»ä¿¡æ¯ * @date 2025-06-17 */ @Data @ApiModel(value = "ExternalInspectionDetail", description = "æ¥æ¶ç¬¬ä¸æ¹æ£æ¥æ¥å详ç»ä¿¡æ¯") public class ExternalInspectionDetail extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "æºæID") private String ZuZhiJGID; @ApiModelProperty(value = "ç æ¡å·") private String BingAnHao; @ApiModelProperty(value = "ç 人ID") private String BingRenID; @ApiModelProperty(value = "ç 人å§å") private String BingRenXM; @ApiModelProperty(value = "è¯ä»¶å·") private String LianXiDH; @ApiModelProperty(value = "ç³è¯·åID") private String ShenQingDID; @ApiModelProperty(value = "ç³è¯·åID") private String BaoGaoID; @ApiModelProperty(value = "ç³è¯·åID") private String JianChaHao; @ApiModelProperty(value = "å½åç¶æä»£ç ") private String DangQianZTDM; @ApiModelProperty(value = "å½åç¶æåç§°") private String DangQianZTMC; @ApiModelProperty(value = "æ¥å人ID") private String BaoGaoRID; @ApiModelProperty(value = "æ¥å人å§å") private String BaoGaoRXM; @ApiModelProperty(value = "æ¥åæ¶é´") private String BaoGaoSJ; @ApiModelProperty(value = "è¯æå°è±¡") private String ZhenDuanYX; @ApiModelProperty(value = "è¯ææè§") private String ZhenDuanSJ; @ApiModelProperty(value = "è¯æå»ºè®®") private String ZhenDuanJY; @ApiModelProperty(value = "æ¥åå°è±¡å°å") private String BaoGaoYXDZ; @ApiModelProperty(value = "屿¥å¼æ å¿") private String WeiJiZBZ; @ApiModelProperty(value = "屿¥å¼å 容") private String WeiJiZNR; @ApiModelProperty(value = "æ¥åç§å®¤ID") private String BaoGaoKSID; @ApiModelProperty(value = "æ¥åç§å®¤åç§°") private String BaoGaoKSMC; @ApiModelProperty(value = "æ£æ¥ç»æä»£ç ") private String JianChaJGDM; @ApiModelProperty(value = "æ£æ¥ç»æåç§°") private String JianChaJGMC; } smartor/src/main/java/com/smartor/domain/ExternalInspectionJC.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,112 @@ package com.smartor.domain; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author æ¥æ¶ç¬¬ä¸æ¹æ£æ¥ä¿¡æ¯ * @date 2025-06-17 */ @Data @ApiModel(value = "ExternalInspectionJC", description = "æ¥æ¶ç¬¬ä¸æ¹æ£æ¥ä¿¡æ¯") public class ExternalInspectionJC extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "ç æ¡å·") private String BingAnHao; @ApiModelProperty(value = "ç 人ID") private String BingRenID; @ApiModelProperty(value = "ç 人å§å") private String BingRenXM; @ApiModelProperty(value = "ä½é¢å·") private String ZhuYuanHao; @ApiModelProperty(value = "è¯ä»¶å·") private String LianXiDH; @ApiModelProperty(value = "åºçæ¥æ") private String ChuShengRQ; @ApiModelProperty(value = "å¼åç§å®¤ID") private String KaiDanKSID; @ApiModelProperty(value = "å¼åç§å®¤åç§°") private String KaiDanKSMC; @ApiModelProperty(value = "å¼å人ID") private String KaiDanRID; @ApiModelProperty(value = "å¼å人å§å") private String KaiDanRXM; @ApiModelProperty(value = "å¼åæ¶é´") private String KaiDanSJ; @ApiModelProperty(value = "å®¡æ ¸äººID") private String ShenHeRID; @ApiModelProperty(value = "å®¡æ ¸äººå§å") private String ShenHeRXM; @ApiModelProperty(value = "å®¡æ ¸æ¶é´") private String ShenHeSJ; @ApiModelProperty(value = "ä¼å 级") private String YouXianJi; @ApiModelProperty(value = "å»å±ID") private String YiZhuID; @ApiModelProperty(value = "ç³è¯·åID") private String ShenQingDID; @ApiModelProperty(value = "æ£æ¥é¡¹ç®ID") private String JianChaXMID; @ApiModelProperty(value = "æ£æ¥é¡¹ç®åç§°") private String JianChaXMMC; @ApiModelProperty(value = "æ£æ¥é¨ä½ID") private String JianChaBWID; @ApiModelProperty(value = "æ£æ¥é¨ä½åç§°") private String JianChaBWMC; @ApiModelProperty(value = "æ£æ¥ç±»åID") private String JianChaLXID; @ApiModelProperty(value = "æ£æ¥ç±»ååç§°") private String JianChaLXMC; @ApiModelProperty(value = "è¯æID") private String ZhenDuanID; @ApiModelProperty(value = "è¯æåç§°") private String ZhenDuanMC; @ApiModelProperty(value = "æ§è¡æ¶é´") private String ZhiXingSJ; @ApiModelProperty(value = "åºè¾¹æ å¿") private String ChuangBianBZ; @ApiModelProperty(value = "æ¨åºæ å¿") private String TuiChuangBZ; @ApiModelProperty(value = "çµåè¶çæ å¿") private String DianZiJPBZ; @ApiModelProperty(value = "å æ¥æ å¿") private String JiaJiBZ; @ApiModelProperty(value = "æªæ¶å æ§è¡æ å¿") private String WeiShouXZXBZ; @ApiModelProperty(value = "éé¢") private String JinE; } smartor/src/main/java/com/smartor/domain/PatMedInspection.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -13,9 +14,10 @@ * æ£è æ£æ¥æ£éªè®°å½å¯¹è±¡ pat_med_inspection * * @author ruoyi * @date 2023-06-16 * @date 2025-06-18 */ @ApiModel(value = "PatMedInspection", description = "æ£è æ£æ¥æ£éªè®°å½å¯¹è±¡") @Data public class PatMedInspection extends BaseEntity { private static final long serialVersionUID = 1L; @@ -24,49 +26,43 @@ @ApiModelProperty(value = "èªå¢ID") private Long id; /** æµæ°´å· */ @Excel(name = " æµæ°´å· ") @ApiModelProperty(value = "æµæ°´å·") private String serialnum; /** æ¡£æ¡ID */ @Excel(name = " æ¡£æ¡ID ") @ApiModelProperty(value = "æ¡£æ¡ID") private Long patid; /** ç±»å;0.æ£éªé¡¹ç® 1.æ£æ¥é¡¹ç® */ @ApiModelProperty(value = "ç±»å;0.æ£éªé¡¹ç® 1.æ£æ¥é¡¹ç®") @Excel(name = " ç±»å;0.æ£éªé¡¹ç® 1.æ£æ¥é¡¹ç® ") private Long projecttype; private Integer projecttype; /** 项ç®ç¼å· */ @Excel(name = " 项ç®ç¼å· ") @ApiModelProperty(value = "项ç®ç¼å·") private String projectcode; /** ç æ¡å· */ @ApiModelProperty(value = "ç æ¡å·") private String inhospno; /** 项ç®åç§° */ @Excel(name = " 项ç®åç§° ") @ApiModelProperty(value = "项ç®åç§°") private String projectname; /** æ£è ID */ @ApiModelProperty(value = "æ£è ID") private String patidHis; /** æ¥åæ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = " æ¥åæ¶é´ ", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty(value = "æ¥åæ¶é´") private Date reporttime; /** è¯ä»¶å·ç */ @ApiModelProperty(value = "è¯ä»¶å·ç ") private String idcardno; /** å»é¢åç§° */ @Excel(name = " å»é¢åç§° ") @ApiModelProperty(value = "å»é¢åç§°") private String hospitalname; /** æ£è å§å */ @ApiModelProperty(value = "æ£è å§å") private String patname; /** å»é¢ç¼å· */ @Excel(name = " å»é¢ç¼å· ") @ApiModelProperty(value = "å»é¢ç¼å·") private String hospitalcode; /** ææºå·ç */ @ApiModelProperty(value = "ææºå·ç ") private String telcode; /** å»å±ID */ @ApiModelProperty(value = "å»å±ID") private Long adviceId; /** ç³è¯·åID */ @ApiModelProperty(value = "ç³è¯·åID") private String appliyid; /** ä¼å 级 */ @ApiModelProperty(value = "ä¼å 级") private String priority; /** æºæID */ @Excel(name = " æºæID ") @ApiModelProperty(value = "æºæID") private String orgid; @@ -74,322 +70,126 @@ @ApiModelProperty(value = "å 餿 è®°") private String delFlag; /** ä¸ä¼ æ è®° */ @ApiModelProperty(value = "ä¸ä¼ æ è®°") @Excel(name = " ä¸ä¼ æ è®° ") private Long isupload; /** å¼å人ID */ @ApiModelProperty(value = "å¼å人ID") private String drcode; /** ä¸ä¼ æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = " ä¸ä¼ æ¶é´ ", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty(value = "ä¸ä¼ æ¶é´") private Date uploadTime; /** 项ç®ID */ @Excel(name = " 项ç®ID ") @ApiModelProperty(value = "项ç®ID") private Long projectid; /** ç³è¯·æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = " ç³è¯·æ¶é´ ", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty(value = "ç³è¯·æ¶é´") private Date applicationtime; /** å°±è¯ç±»å */ @Excel(name = " å°±è¯ç±»å ") @ApiModelProperty(value = "å°±è¯ç±»å") private Long visittype; /** å°±è¯ID */ @Excel(name = " å°±è¯ID ") @ApiModelProperty(value = "å°±è¯ID") private Long visitid; /** æ¯å¦çææ¹æ¡ç¶æ;0æªçæ 1çæç³è¯·å 2.çææ¥åå 9æ å¹é æ¹æ¡ */ @Excel(name = " æ¯å¦çææ¹æ¡ç¶æ;0æªçæ 1çæç³è¯·å 2.çææ¥åå 9æ å¹é æ¹æ¡ ") @ApiModelProperty(value = "æ¯å¦çææ¹æ¡ç¶æ;0æªçæ 1çæç³è¯·å 2.çææ¥åå 9æ å¹é æ¹æ¡") private Long schemestatus; /** æ¯å¦å¼å¸¸;0å¦ 1æ¯ */ @Excel(name = " æ¯å¦å¼å¸¸;0å¦ 1æ¯ ") @ApiModelProperty(value = "æ¯å¦å¼å¸¸;0å¦ 1æ¯") private Long isabnormal; /** æ¥åç»è®º */ @Excel(name = " æ¥åç»è®º ") @ApiModelProperty(value = "æ¥åç»è®º") private String reportconclusion; /** æ¹æ¡ç¶ææä½æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = " æ¹æ¡ç¶ææä½æ¶é´ ", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty(value = "æ¹æ¡ç¶ææä½æ¶é´") private Date schemetime; /** å¼å人å§å */ @ApiModelProperty(value = "å¼å人å§å") private String drname; /** å¼åç§å®¤ä»£ç */ @Excel(name = " å¼åç§å®¤ä»£ç ") @ApiModelProperty(value = "å¼åç§å®¤ä»£ç ") private String deptcode; /** å¼åç§å®¤åç§° */ @Excel(name = " å¼åç§å®¤åç§° ") @ApiModelProperty(value = "å¼åç§å®¤åç§°") private String deptname; /** å¼åç§å®¤ID */ @Excel(name = " å¼åç§å®¤ID ") @ApiModelProperty(value = "å¼åç§å®¤ID") private Long deptid; /** å¼åæ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "å¼åæ¶é´") private Date opendate; public void setId(Long id) { this.id = id; } /** å®¡æ ¸äººID */ @ApiModelProperty(value = "å®¡æ ¸äººID") private String operatorId; public Long getId() { return id; } public void setSerialnum(String serialnum) { this.serialnum = serialnum; } /** å®¡æ ¸äººå§å */ @ApiModelProperty(value = "å®¡æ ¸äººå§å") private String operatorName; public String getSerialnum() { return serialnum; } public void setPatid(Long patid) { this.patid = patid; } /** å®¡æ ¸æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "å®¡æ ¸æ¶é´") private Date operatorDate; public Long getPatid() { return patid; } public void setProjecttype(Long projecttype) { this.projecttype = projecttype; } /** éé¢ */ @ApiModelProperty(value = "éé¢") private Float money; public Long getProjecttype() { return projecttype; } public void setProjectcode(String projectcode) { this.projectcode = projectcode; } /** ä¿®æ¹äºº */ @ApiModelProperty(value = "ä¿®æ¹äºº") private String updateBy; public String getProjectcode() { return projectcode; } public void setProjectname(String projectname) { this.projectname = projectname; } /** ä¿®æ¹æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "ä¿®æ¹æ¶é´") private Date updateDate; public String getProjectname() { return projectname; } public void setReporttime(Date reporttime) { this.reporttime = reporttime; } /** å建人 */ @ApiModelProperty(value = "å建人") private String createBy; public Date getReporttime() { return reporttime; } public void setHospitalname(String hospitalname) { this.hospitalname = hospitalname; } /** å建æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "å建æ¶é´") private Date createTime; public String getHospitalname() { return hospitalname; } public void setHospitalcode(String hospitalcode) { this.hospitalcode = hospitalcode; } /** æ§è¡æ¶é´ */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "æ§è¡æ¶é´") private Date startTime; public String getHospitalcode() { return hospitalcode; } public void setOrgid(String orgid) { this.orgid = orgid; } /** æ£æ¥é¡¹ç®ID */ @ApiModelProperty(value = "æ£æ¥é¡¹ç®ID") private String projectId; public String getOrgid() { return orgid; } public void setDelFlag(String delFlag) { this.delFlag = delFlag; } /** æ£æ¥é¡¹ç®åç§° */ @ApiModelProperty(value = "æ£æ¥é¡¹ç®åç§°") private String projectName; public String getDelFlag() { return delFlag; } public void setIsupload(Long isupload) { this.isupload = isupload; } /** è¯æID */ @ApiModelProperty(value = "è¯æID") private String diagid; public Long getIsupload() { return isupload; } public void setUploadTime(Date uploadTime) { this.uploadTime = uploadTime; } /** è¯æåç§° */ @ApiModelProperty(value = "è¯æåç§°") private String diagname; public Date getUploadTime() { return uploadTime; } public void setProjectid(Long projectid) { this.projectid = projectid; } /** æ£æ¥é¨ä½ID */ @ApiModelProperty(value = "æ£æ¥é¨ä½ID") private String partId; public Long getProjectid() { return projectid; } public void setApplicationtime(Date applicationtime) { this.applicationtime = applicationtime; } /** æ£æ¥é¨ä½åç§° */ @ApiModelProperty(value = "æ£æ¥é¨ä½åç§°") private String partName; public Date getApplicationtime() { return applicationtime; } public void setVisittype(Long visittype) { this.visittype = visittype; } /** æ£æ¥ç±»åID */ @ApiModelProperty(value = "æ£æ¥ç±»åID") private String typeId; public Long getVisittype() { return visittype; } public void setVisitid(Long visitid) { this.visitid = visitid; } /** æ£æ¥ç±»ååç§° */ @ApiModelProperty(value = "æ£æ¥ç±»ååç§°") private String typeName; public Long getVisitid() { return visitid; } public void setSchemestatus(Long schemestatus) { this.schemestatus = schemestatus; } /** è¶çè´¹æ å¿ */ @ApiModelProperty(value = "è¶çè´¹æ å¿") private Integer filmFlag; public Long getSchemestatus() { return schemestatus; } public void setIsabnormal(Long isabnormal) { this.isabnormal = isabnormal; } /** åºè¾¹æ å¿ */ @ApiModelProperty(value = "åºè¾¹æ å¿") private Integer bedFlag; public Long getIsabnormal() { return isabnormal; } public void setReportconclusion(String reportconclusion) { this.reportconclusion = reportconclusion; } /** æ¨åºæ å¿ */ @ApiModelProperty(value = "æ¨åºæ å¿") private Integer pushFlag; public String getReportconclusion() { return reportconclusion; } public void setSchemetime(Date schemetime) { this.schemetime = schemetime; } /** å æ¥æ å¿ */ @ApiModelProperty(value = "å æ¥æ å¿") private Integer urgentFlag; public Date getSchemetime() { return schemetime; } public void setDeptcode(String deptcode) { this.deptcode = deptcode; } /** æªæ¶å æ§è¡æ å¿ */ @ApiModelProperty(value = "æªæ¶å æ§è¡æ å¿") private Integer nostartFlag; public String getDeptcode() { return deptcode; } public void setDeptname(String deptname) { this.deptname = deptname; } @ApiModelProperty(value = "ç¶GUID") private String pguid; public String getDeptname() { return deptname; } public void setDeptid(Long deptid) { this.deptid = deptid; } @ApiModelProperty(value = "ç¶ID") private String guid; public Long getDeptid() { return deptid; } @ApiModelProperty(value = "ç¶ID") private Integer pid; @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("serialnum", getSerialnum()) .append("patid", getPatid()) .append("projecttype", getProjecttype()) .append("projectcode", getProjectcode()) .append("projectname", getProjectname()) .append("reporttime", getReporttime()) .append("hospitalname", getHospitalname()) .append("hospitalcode", getHospitalcode()) .append("orgid", getOrgid()) .append("delFlag", getDelFlag()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("isupload", getIsupload()) .append("uploadTime", getUploadTime()) .append("projectid", getProjectid()) .append("applicationtime", getApplicationtime()) .append("visittype", getVisittype()) .append("visitid", getVisitid()) .append("schemestatus", getSchemestatus()) .append("isabnormal", getIsabnormal()) .append("reportconclusion", getReportconclusion()) .append("schemetime", getSchemetime()) .append("deptcode", getDeptcode()) .append("deptname", getDeptname()) .append("deptid", getDeptid()) .toString(); } } smartor/src/main/java/com/smartor/domain/PatMedInspectionItem.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,145 @@ package com.smartor.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * æ£è æ£æ¥æ£éªè®°å½è¯¦æ 对象 pat_med_inspection_item * * @author ruoyi * @date 2025-06-18 */ @ApiModel(value = "PatMedInspectionItem", description = "æ£è æ£æ¥æ£éªè®°å½è¯¦æ 对象") @Data public class PatMedInspectionItem extends BaseEntity { private static final long serialVersionUID = 1L; /** èªå¢ID */ @ApiModelProperty(value = "èªå¢ID") private Long id; /** 对åºè®°å½è¡¨ */ @ApiModelProperty(value = "对åºè®°å½è¡¨") private Integer inspectionid; /** æ£æ¥å· */ @ApiModelProperty(value = "æ£æ¥å·") private String inspectionName; /** æ¥åID */ @ApiModelProperty(value = "æ¥åID") private String reportid; /** å»é¢æºæID */ @ApiModelProperty(value = "å»é¢æºæID") private String orgid; /** å½åç¶æä»£ç */ @ApiModelProperty(value = "å½åç¶æä»£ç ") private String statuscode; /** å½å代ç åç§° */ @ApiModelProperty(value = "å½å代ç åç§°") private String statusname; /** æ¥å人ID */ @ApiModelProperty(value = "æ¥å人ID") private String reporterid; /** æ¥å人å§å */ @ApiModelProperty(value = "æ¥å人å§å") private String reportername; /** æ¥åæ¶é´ */ @ApiModelProperty(value = "æ¥åæ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date reportdate; /** è¯æå°è±¡ */ @ApiModelProperty(value = "è¯æå°è±¡") private String diagimpression; /** è¯ææè§ */ @ApiModelProperty(value = "è¯ææè§") private String diagfindings; /** è¯æå»ºè®® */ @ApiModelProperty(value = "è¯æå»ºè®®") private String diagsuggestion; /** æ¥åå°å */ @ApiModelProperty(value = "æ¥åå°å") private String reporturl; /** 屿¥å¼æ å¿ */ @ApiModelProperty(value = "屿¥å¼æ å¿") private Integer criticalFlag; /** 屿¥å¼å 容 */ @ApiModelProperty(value = "屿¥å¼å 容") private String criticalContent; /** æ¥åç§å®¤id */ @ApiModelProperty(value = "æ¥åç§å®¤id") private String reportdeptid; /** æ¥åç§å®¤åç§° */ @ApiModelProperty(value = "æ¥åç§å®¤åç§°") private String reportdeptname; /** æ£æ¥ç»æä»£ç */ @ApiModelProperty(value = "æ£æ¥ç»æä»£ç ") private String resultcode; /** æ£æ¥ç»æåç§° */ @ApiModelProperty(value = "æ£æ¥ç»æåç§°") private String resultname; /** å 餿 å¿ï¼0ï¼æªå é¤ 1ï¼å·²å é¤ï¼ */ @ApiModelProperty(value = "å 餿 å¿ï¼0ï¼æªå é¤ 1ï¼å·²å é¤ï¼") private String delFlag; /** æ´æ°äºº */ @ApiModelProperty(value = "æ´æ°äºº") private String updateBy; /** æ´æ°æ¶é´ */ @ApiModelProperty(value = "æ´æ°æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date updateTime; /** å建人 */ @ApiModelProperty(value = "å建人") private String createBy; /** å建æ¶é´ */ @ApiModelProperty(value = "å建æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date createTime; /** ä¸ä¼ æ å¿ï¼0ï¼æªä¸ä¼ 1ï¼å·²ä¸ä¼ ï¼ */ @ApiModelProperty(value = "ä¸ä¼ æ å¿ï¼0ï¼æªä¸ä¼ 1ï¼å·²ä¸ä¼ ï¼") private Integer isupload; /** ä¸ä¼ æ¶é´ */ @ApiModelProperty(value = "ä¸ä¼ æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date uploadTime; /** ç¶GUID */ @ApiModelProperty(value = "ç¶GUID") private String pguid; /** GUID */ @ApiModelProperty(value = "GUID") private String guid; /** ç¶ID */ @ApiModelProperty(value = "ç¶ID") private Integer pid; } smartor/src/main/java/com/smartor/mapper/PatMedInspectionItemMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,65 @@ package com.smartor.mapper; import com.smartor.domain.PatMedInspectionItem; import org.apache.ibatis.annotations.Mapper; import java.util.List; /** * æ£è æ£æ¥æ£éªè¯¦æ è®°å½Mapperæ¥å£ * * @author ruoyi * @date 2025-06-21 */ @Mapper public interface PatMedInspectionItemMapper { /** * æ¥è¯¢æ£è æ£æ¥æ£éªè®°å½ * * @param id æ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return æ£è æ£æ¥æ£éªè®°å½ */ public PatMedInspectionItem selectPatMedInspectionItemById(Long id); /** * æ¥è¯¢æ£è æ£æ¥æ£éªè®°å½å表 * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return æ£è æ£æ¥æ£éªè®°å½éå */ public List<PatMedInspectionItem> selectPatMedInspectionItemList(PatMedInspectionItem patMedInspectionItem); /** * æ°å¢æ£è æ£æ¥æ£éªè®°å½ * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return ç»æ */ public int insertPatMedInspectionItem(PatMedInspectionItem patMedInspectionItem); /** * ä¿®æ¹æ£è æ£æ¥æ£éªè®°å½ * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return ç»æ */ public int updatePatMedInspectionItem(PatMedInspectionItem patMedInspectionItem); /** * å 餿£è æ£æ¥æ£éªè®°å½ * * @param id æ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return ç»æ */ public int deletePatMedInspectionItemById(Long id); /** * æ¹éå 餿£è æ£æ¥æ£éªè®°å½ * * @param ids éè¦å é¤çæ°æ®ä¸»é®éå * @return ç»æ */ public int deletePatMedInspectionItemByIds(Long[] ids); } smartor/src/main/java/com/smartor/service/IPatMedInspectionItemService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,64 @@ package com.smartor.service; import com.smartor.domain.PatMedInspectionItem; import java.util.List; /** * æ£è æ£æ¥æ£éªè¯¦æ è®°å½Serviceæ¥å£ * * @author ruoyi * @date 2025-06-21 */ public interface IPatMedInspectionItemService { /** * æ¥è¯¢æ£è æ£æ¥æ£éªè®°å½ * * @param id æ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return æ£è æ£æ¥æ£éªè®°å½ */ public PatMedInspectionItem selectPatMedInspectionItemById(Long id); /** * æ¥è¯¢æ£è æ£æ¥æ£éªè®°å½å表 * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return æ£è æ£æ¥æ£éªè®°å½éå */ public List<PatMedInspectionItem> selectPatMedInspectionItemList(PatMedInspectionItem patMedInspectionItem); /** * æ°å¢æ£è æ£æ¥æ£éªè®°å½ * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return ç»æ */ public int insertPatMedInspectionItem(PatMedInspectionItem patMedInspectionItem); /** * ä¿®æ¹æ£è æ£æ¥æ£éªè®°å½ * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return ç»æ */ public int updatePatMedInspectionItem(PatMedInspectionItem patMedInspectionItem); /** * æ¹éå 餿£è æ£æ¥æ£éªè®°å½ * * @param ids éè¦å é¤çæ£è æ£æ¥æ£éªè®°å½ä¸»é®éå * @return ç»æ */ public int deletePatMedInspectionItemByIds(Long[] ids); /** * å 餿£è æ£æ¥æ£éªè®°å½ä¿¡æ¯ * * @param id æ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return ç»æ */ public int deletePatMedInspectionItemById(Long id); } smartor/src/main/java/com/smartor/service/IServiceExternalService.java
@@ -73,6 +73,11 @@ public Boolean addOutHospInfo(@RequestBody Map dataMap); /** * æ°å¢åºé¢è®°å½ç»è®°ä¿¡æ¯ */ public Boolean addOutHospJLInfo(@RequestBody Map dataMap); /** * åæ¶åºé¢ç»è®°ä¿¡æ¯ */ public Boolean cancelOutHospInfo(@RequestBody Map dataMap); @@ -107,4 +112,14 @@ * æ°å¢å»çç»å»ç */ public Boolean addMedicalTeam(Map dataMap); /** * æ£æ¥ç³è¯·æå¡ */ public Boolean addInspectService(Map dataMap); /** * æ£æ¥æ¥åæå¡ */ public Boolean addInspectBGService(Map dataMap); } smartor/src/main/java/com/smartor/service/impl/PatMedInspectionItemServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,100 @@ package com.smartor.service.impl; import com.ruoyi.common.utils.DateUtils; import com.smartor.domain.PatMedInspection; import com.smartor.domain.PatMedInspectionItem; import com.smartor.mapper.PatMedInspectionItemMapper; import com.smartor.service.IPatMedInspectionItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * æ£è æ£æ¥æ£éªè¯¦æ è®°å½Serviceä¸å¡å±å¤ç * * @author ruoyi * @date 2025-06-21 */ @Service public class PatMedInspectionItemServiceImpl implements IPatMedInspectionItemService { @Autowired private PatMedInspectionItemMapper patMedInspectionItemMapper; /** * æ¥è¯¢æ£è æ£æ¥æ£éªè®°å½ * * @param id æ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return æ£è æ£æ¥æ£éªè®°å½ */ @Override public PatMedInspectionItem selectPatMedInspectionItemById(Long id) { return patMedInspectionItemMapper.selectPatMedInspectionItemById(id); } /** * æ¥è¯¢æ£è æ£æ¥æ£éªè®°å½å表 * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return æ£è æ£æ¥æ£éªè®°å½ */ @Override public List<PatMedInspectionItem> selectPatMedInspectionItemList(PatMedInspectionItem patMedInspectionItem) { return patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem); } /** * æ°å¢æ£è æ£æ¥æ£éªè®°å½ * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return ç»æ */ @Override public int insertPatMedInspectionItem(PatMedInspectionItem patMedInspectionItem) { patMedInspectionItem.setCreateTime(DateUtils.getNowDate()); patMedInspectionItem.setUpdateTime(DateUtils.getNowDate()); return patMedInspectionItemMapper.insertPatMedInspectionItem(patMedInspectionItem); } /** * ä¿®æ¹æ£è æ£æ¥æ£éªè®°å½ * * @param patMedInspectionItem æ£è æ£æ¥æ£éªè®°å½ * @return ç»æ */ @Override public int updatePatMedInspectionItem(PatMedInspectionItem patMedInspectionItem) { patMedInspectionItem.setUpdateTime(DateUtils.getNowDate()); return patMedInspectionItemMapper.updatePatMedInspectionItem(patMedInspectionItem); } /** * æ¹éå 餿£è æ£æ¥æ£éªè®°å½ * * @param ids éè¦å é¤çæ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return ç»æ */ @Override public int deletePatMedInspectionItemByIds(Long[] ids) { return patMedInspectionItemMapper.deletePatMedInspectionItemByIds(ids); } /** * å 餿£è æ£æ¥æ£éªè®°å½ä¿¡æ¯ * * @param id æ£è æ£æ¥æ£éªè®°å½ä¸»é® * @return ç»æ */ @Override public int deletePatMedInspectionItemById(Long id) { return patMedInspectionItemMapper.deletePatMedInspectionItemById(id); } } smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -56,6 +56,10 @@ @Autowired private PatMedOperationItemMapper patMedOperationItemMapper; @Autowired private PatMedInspectionMapper patMedInspectionMapper; @Autowired private PatMedInspectionItemMapper patMedInspectionItemMapper; @Autowired private Icd10Mapper icd10Mapper; @Autowired private PatMedOuthospMapper patMedOuthospMapper; @@ -432,6 +436,139 @@ } catch (ParseException e) { e.printStackTrace(); } } patMedInhosp1.setFuperiod(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangZQJY")) ? SuiFangJH.get("SuiFangZQJY").toString() : null); patMedInhosp1.setFutypecode(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangFSDM")) ? SuiFangJH.get("SuiFangFSDM").toString() : null); patMedInhosp1.setFutypedesc(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangFSMC")) ? SuiFangJH.get("SuiFangFSMC").toString() : null); patMedInhosp1.setFuadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("FuZhenZD")) ? SuiFangJH.get("FuZhenZD").toString() : null); patMedInhosp1.setFuspecialadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("QiTaZKJBSF")) ? SuiFangJH.get("QiTaZKJBSF").toString() : null); } List<HashMap<String, Object>> zhenDuanList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList") : null; if (CollectionUtils.isNotEmpty(zhenDuanList)) { List<ExternalInHospPatientDiagnoseInfo> hospPatientDiagnoseInfos2 = zhenDuanList.stream().map(map -> { ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo(); info.setZhenDuanID((String) map.get("ZhenDuanID")); info.setZhenDuanMC((String) map.get("ZhenDuanMC")); info.setIcd10((String) map.get("Icd10")); return info; }).collect(Collectors.toList()); patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10()); patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); //patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC()); } patMedInhosp1.setInhospstate("1"); if (CollectionUtils.isNotEmpty(patMedInhospList)) { patMedInhosp1.setUpdateTime(new Date()); patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null); int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; } else { if (ObjectUtils.isNotEmpty(BingRenXX)) { patMedInhosp1.setHospitalname(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGMC")) ? BingRenXX.get("ZuZhiJGMC").toString() : null); patMedInhosp1.setHospitalcode(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null); patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null); patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null); patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null); patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null); patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null); patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null); } patMedInhosp1.setPatid(patArchive.getId()); patMedInhosp1.setPatname(patArchive.getName()); patMedInhosp1.setCreateTime(new Date()); int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1); if (i != 1) return false; } return true; } @Override public Boolean addOutHospJLInfo(Map dataMap) { log.error("ServiceExternalServiceImpl---addOutHospJLInfoçæ°å¢çå¼ä¸ºï¼{}", dataMap); Map yeWuXX = (Map) dataMap.get("YeWuXX"); Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null; Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null; List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null; List<HashMap<String, Object>> epli = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("LianXiRList") : null; Map<String, Object> SuiFangJH = ObjectUtils.isNotEmpty(ChuYuanJL) ? (Map<String, Object>) ChuYuanJL.get("SuiFangJH") : null; ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true); ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null; ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null; List<ExternalInHospPatientAddrInfo> epai2 = null; if (CollectionUtils.isNotEmpty(epai)) { epai2 = epai.stream().map(map -> { ExternalInHospPatientAddrInfo info = new ExternalInHospPatientAddrInfo(); info.setDiZhiLX((String) map.get("DiZhiLX")); // åè®¾åæ®µç±»åæ¯ Integer info.setDiZhiXX((String) map.get("DiZhiXX")); info.setShengFenDM((String) map.get("ShengFenDM")); info.setShengFenMC((String) map.get("ShengFenMC")); info.setShiDiQDM((String) map.get("ShiDiQDM")); info.setShiDiQMC((String) map.get("ShiDiQMC")); info.setXianQuDM((String) map.get("XianQuDM")); info.setXianQuMC((String) map.get("XianQuMC")); info.setXiangZhenDM((String) map.get("XiangZhenDM")); info.setXiangZhenMC((String) map.get("XiangZhenMC")); info.setCunJiDM((String) map.get("CunJiDM")); info.setQiTaXX((String) map.get("QiTaXX")); info.setYouBian((String) map.get("YouBian")); return info; }).collect(Collectors.toList()); } List<ExternalInHospPatientLiaisonInfo> epli2 = null; if (CollectionUtils.isNotEmpty(epli)) { epli2 = epli.stream().map(map -> { ExternalInHospPatientLiaisonInfo info = new ExternalInHospPatientLiaisonInfo(); info.setLianXiRXM((String) map.get("LianXiRXM")); info.setLianXiRDH((String) map.get("LianXiRDH")); info.setGuanXiDM((String) map.get("GuanXiDM")); info.setGuanXiMC((String) map.get("GuanXiMC")); return info; }).collect(Collectors.toList()); } if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0); if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0); //æ°å¢æ£è åºæ¬ä¿¡æ¯æ°å¢æä¿®æ¹ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo); PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } PatMedInhosp patMedInhosp1 = new PatMedInhosp(); if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0); patMedInhosp1.setSchemestatus(2L); patMedInhosp1.setUpdateTime(new Date()); patMedInhosp1.setTelcode(patArchive.getTelcode()); patMedInhosp1.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID()); patMedInhosp1.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC()); patMedInhosp1.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC()); patMedInhosp1.setDeptname(externalInHospPatientInfo.getDangQianKSMC()); patMedInhosp1.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID()); patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID()); if (ObjectUtils.isNotEmpty(SuiFangJH)) { patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null); if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); patMedInhosp1.setFudate(simpleDateFormat.parse(SuiFangJH.get("SuiFangRQ").toString())); } catch (ParseException e) { e.printStackTrace(); } } try { patMedInhosp1.setFudate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(SuiFangJH.get("SuiFangRQ").toString())); } catch (ParseException e) { e.printStackTrace(); } patMedInhosp1.setFuperiod(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangZQJY")) ? SuiFangJH.get("SuiFangZQJY").toString() : null); patMedInhosp1.setFutypecode(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangFSDM")) ? SuiFangJH.get("SuiFangFSDM").toString() : null); @@ -1174,6 +1311,212 @@ return true; } //æ£æ¥ç³è¯·æå¡ @Override public Boolean addInspectService(Map dataMap) { log.error("ServiceExternalServiceImpl---addInspectServiceçæ°å¢çå¼ä¸ºï¼{}", dataMap); Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou"); Map yeWuXX = (Map) dataMap.get("YeWuXX"); Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null; Map<String, Object> JianChaSQ = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaSQ") : null; List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("JianChaBWList") : null; List<HashMap<String, Object>> ZhenDuanList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("ZhenDuanList") : null; List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null; ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true); externalInHospPatientInfo.setZuZhiJGID(xiaoXiTou.get("FaSongJGID").toString()); ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null; ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null; List<ExternalInHospPatientAddrInfo> epai2 = null; if (CollectionUtils.isNotEmpty(epai)) { epai2 = epai.stream().map(map -> { ExternalInHospPatientAddrInfo info = new ExternalInHospPatientAddrInfo(); info.setDiZhiLX((String) map.get("DiZhiLX")); // åè®¾åæ®µç±»åæ¯ Integer info.setDiZhiXX((String) map.get("DiZhiXX")); info.setShengFenDM((String) map.get("ShengFenDM")); info.setShengFenMC((String) map.get("ShengFenMC")); info.setShiDiQDM((String) map.get("ShiDiQDM")); info.setShiDiQMC((String) map.get("ShiDiQMC")); info.setXianQuDM((String) map.get("XianQuDM")); info.setXianQuMC((String) map.get("XianQuMC")); info.setXiangZhenDM((String) map.get("XiangZhenDM")); info.setXiangZhenMC((String) map.get("XiangZhenMC")); info.setCunJiDM((String) map.get("CunJiDM")); info.setQiTaXX((String) map.get("QiTaXX")); info.setYouBian((String) map.get("YouBian")); return info; }).collect(Collectors.toList()); } if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0); //æ°å¢æ£è åºæ¬ä¿¡æ¯æ°å¢æä¿®æ¹ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo); PatMedInspection patMedInspection = new PatMedInspection(); patMedInspection.setProjecttype(1); patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID()); patMedInspection.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedInspection.setPatidHis(externalInHospPatientInfo.getBingRenID()); patMedInspection.setPatname(externalInHospPatientInfo.getXingMing()); patMedInspection.setProjecttype(1); if (ObjectUtils.isNotEmpty(BingRenXX)) { patMedInspection.setIdcardno(ObjectUtils.isNotEmpty(BingRenXX.get("ZhengJianHM")) ? BingRenXX.get("ZhengJianHM").toString() : null); patMedInspection.setTelcode(ObjectUtils.isNotEmpty(BingRenXX.get("LianXiDH")) ? BingRenXX.get("LianXiDH").toString() : null); } List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection); if(ObjectUtils.isNotEmpty(JianChaSQ)){ patMedInspection.setAdviceId(Long.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("YiZhuID")) ? JianChaSQ.get("YiZhuID").toString() : null)); patMedInspection.setAppliyid(ObjectUtils.isNotEmpty(JianChaSQ.get("ShenQingDID")) ? JianChaSQ.get("ShenQingDID").toString() : null); patMedInspection.setPriority(ObjectUtils.isNotEmpty(JianChaSQ.get("YouXianJi")) ? JianChaSQ.get("YouXianJi").toString() : null); patMedInspection.setDrcode(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanRID")) ? JianChaSQ.get("KaiDanRID").toString() : null); patMedInspection.setDrname(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanRXM")) ? JianChaSQ.get("KaiDanRXM").toString() : null); patMedInspection.setDeptcode(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanKSID")) ? JianChaSQ.get("KaiDanKSID").toString() : null); patMedInspection.setDeptname(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanKSMC")) ? JianChaSQ.get("KaiDanKSMC").toString() : null); patMedInspection.setOperatorId(ObjectUtils.isNotEmpty(JianChaSQ.get("ShenHeRID")) ? JianChaSQ.get("ShenHeRID").toString() : null); patMedInspection.setOperatorName(ObjectUtils.isNotEmpty(JianChaSQ.get("ShenHeRXM")) ? JianChaSQ.get("ShenHeRXM").toString() : null); patMedInspection.setTypeId(ObjectUtils.isNotEmpty(JianChaSQ.get("JianChaLXID")) ? JianChaSQ.get("JianChaLXID").toString() : null); patMedInspection.setTypeName(ObjectUtils.isNotEmpty(JianChaSQ.get("JianChaLXMC")) ? JianChaSQ.get("JianChaLXMC").toString() : null); patMedInspection.setMoney(Float.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("JinE")) ? JianChaSQ.get("JinE").toString() : null)); patMedInspection.setFilmFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("JiaoPianFBZ")) ? JianChaSQ.get("JiaoPianFBZ").toString() : null)); patMedInspection.setBedFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("ChuangBianBZ")) ? JianChaSQ.get("ChuangBianBZ").toString() : null)); patMedInspection.setPushFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("TuiChuangBZ")) ? JianChaSQ.get("TuiChuangBZ").toString() : null)); patMedInspection.setUrgentFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("JiaJiBZ")) ? JianChaSQ.get("JiaJiBZ").toString() : null)); patMedInspection.setNostartFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("WeiShouXZXBZ")) ? JianChaSQ.get("WeiShouXZXBZ").toString() : null)); if (ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanSJ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); patMedInspection.setOpendate(simpleDateFormat.parse(JianChaSQ.get("KaiDanSJ").toString())); } catch (ParseException e) { e.printStackTrace(); } } if (ObjectUtils.isNotEmpty(JianChaSQ.get("ShenHeSJ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); patMedInspection.setOperatorDate(simpleDateFormat.parse(JianChaSQ.get("ShenHeSJ").toString())); } catch (ParseException e) { e.printStackTrace(); } } if (ObjectUtils.isNotEmpty(JianChaSQ.get("ZhiXingSJ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); patMedInspection.setStartTime(simpleDateFormat.parse(JianChaSQ.get("ZhiXingSJ").toString())); } catch (ParseException e) { e.printStackTrace(); } } } if (CollectionUtils.isNotEmpty(JianChaBWList)) { List<ExternalInspectionJC> externalInspectionJC = JianChaBWList.stream().map(map -> { ExternalInspectionJC info = new ExternalInspectionJC(); info.setJianChaXMID((String) map.get("JianChaXMID")); info.setJianChaXMMC((String) map.get("JianChaXMMC")); info.setJianChaBWID((String) map.get("JianChaBWID")); info.setJianChaBWMC((String) map.get("JianChaBWMC")); return info; }).collect(Collectors.toList()); patMedInspection.setProjectId(externalInspectionJC.get(0).getJianChaXMID()); patMedInspection.setProjectName(externalInspectionJC.get(0).getJianChaXMMC()); patMedInspection.setPartId(externalInspectionJC.get(0).getJianChaBWID()); patMedInspection.setPartName(externalInspectionJC.get(0).getJianChaBWMC()); } if (CollectionUtils.isNotEmpty(ZhenDuanList)) { List<ExternalInspectionJC> externalInspectionJC = ZhenDuanList.stream().map(map -> { ExternalInspectionJC info = new ExternalInspectionJC(); info.setZhenDuanID((String) map.get("ZhenDuanID")); info.setZhenDuanMC((String) map.get("ZhenDuanMC")); return info; }).collect(Collectors.toList()); patMedInspection.setDiagid(externalInspectionJC.get(0).getZhenDuanID()); patMedInspection.setDiagname(externalInspectionJC.get(0).getZhenDuanMC()); } if (CollectionUtils.isNotEmpty(patMedInspections)){ patMedInspection.setUpdateDate(new Date()); patMedInspection.setOrgid(ObjectUtils.isNotEmpty(xiaoXiTou) && ObjectUtils.isNotEmpty(xiaoXiTou.get("FaSongJGID")) ? xiaoXiTou.get("FaSongJGID").toString() : null); // æ´æ°æä½ int i = patMedInspectionMapper.updatePatMedInspection(patMedInspection); if (i != 1) return false; }else { patMedInspection.setDelFlag("0"); patMedInspection.setCreateTime(new Date()); int i = patMedInspectionMapper.insertPatMedInspection(patMedInspection); if (i != 1) return false; } return true; } //æ£æ¥è¯¦æ æ·»å @Override public Boolean addInspectBGService(Map dataMap) { log.error("ServiceExternalServiceImpl---addInspectBGServiceçæ°å¢çå¼ä¸ºï¼{}", dataMap); Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou"); Map yeWuXX = (Map) dataMap.get("YeWuXX"); Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null; Map<String, Object> JianChaBG = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaBG") : null; List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaBG) ? (List<HashMap<String, Object>>) JianChaBG.get("JianChaBWList") : null; PatMedInspection patMedInspection = new PatMedInspection(); PatMedInspectionItem patMedInspectionItem = new PatMedInspectionItem(); patMedInspection.setOrgid(BingRenXX.get("ZuZhiJGID").toString()); patMedInspection.setInhospno(BingRenXX.get("BingAnHao").toString()); patMedInspection.setPatidHis(BingRenXX.get("BingRenID").toString()); patMedInspection.setPatname(BingRenXX.get("XingMing").toString()); patMedInspection.setAppliyid(JianChaBG.get("ShenQingDID").toString()); //æ¥æ¾æ£è æ£æ¥æ£éªä¿¡æ¯ï¼å¦ææ ï¼è¿è¡æ°å List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection); if(CollectionUtils.isNotEmpty(patMedInspections)){ patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue()); }else{ addInspectService(dataMap); List<PatMedInspection> patMedInspections2 = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection); patMedInspectionItem.setInspectionid(patMedInspections2.get(0).getId().intValue()); } //æ£æ¥æ£éªæ¥åæ°æ®å¤ç patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString()); List<PatMedInspectionItem> patMedInspectionItems = patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem); if (ObjectUtils.isNotEmpty(JianChaBG)){ patMedInspectionItem.setInspectionName(JianChaBG.get("JianChaHao").toString()); patMedInspectionItem.setReportid(JianChaBG.get("JianChaHao").toString()); patMedInspectionItem.setStatuscode(JianChaBG.get("DangQianZTDM").toString()); patMedInspectionItem.setStatusname(JianChaBG.get("DangQianZTMC").toString()); patMedInspectionItem.setReportid(JianChaBG.get("BaoGaoRID").toString()); patMedInspectionItem.setReportername(JianChaBG.get("BaoGaoRXM").toString()); patMedInspectionItem.setDiagimpression(JianChaBG.get("ZhenDuanYX").toString()); patMedInspectionItem.setDiagfindings(JianChaBG.get("ZhenDuanSJ").toString()); patMedInspectionItem.setDiagsuggestion(JianChaBG.get("ZhenDuanJY").toString()); patMedInspectionItem.setReporturl(JianChaBG.get("BaoGaoYXDZ").toString()); patMedInspectionItem.setCriticalFlag(Integer.valueOf(JianChaBG.get("WeiJiZBZ").toString())); patMedInspectionItem.setCriticalContent(JianChaBG.get("WeiJiZNR").toString()); patMedInspectionItem.setReportdeptid(JianChaBG.get("BaoGaoKSID").toString()); patMedInspectionItem.setReportdeptname(JianChaBG.get("BaoGaoKSMC").toString()); patMedInspectionItem.setResultcode(JianChaBG.get("JianChaJGDM").toString()); patMedInspectionItem.setResultname(JianChaBG.get("JianChaJGMC").toString()); if (ObjectUtils.isNotEmpty(JianChaBG.get("BaoGaoSJ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); patMedInspection.setOpendate(simpleDateFormat.parse(JianChaBG.get("BaoGaoSJ").toString())); } catch (ParseException e) { e.printStackTrace(); } } } if(ObjectUtils.isNotEmpty(patMedInspectionItems)){ patMedInspectionItem.setUpdateTime(new Date()); int i = patMedInspectionItemMapper.updatePatMedInspectionItem(patMedInspectionItem); if (i != 1) return false; }else { patMedInspectionItem.setDelFlag("0"); patMedInspectionItem.setCreateTime(new Date()); int i = patMedInspectionItemMapper.insertPatMedInspectionItem(patMedInspectionItem); if (i != 1) return false; } return true; } private Boolean getType(String type, Map dataMap) { switch (type) { case "BR_DA_DangAnJL": @@ -1205,22 +1548,25 @@ return true; case "JC_SQ_ShenQing": log.error("æ£æ¥ç³è¯·åå ¥åç±»å为ï¼{}", type); return true; return addInspectService(dataMap); case "JC_SQ_XiuGai": log.error("æ£æ¥ç³è¯·ä¿¡æ¯æ´æ°å ¥åç±»å为ï¼{}", type); return true; return addInspectService(dataMap); case "JC_SQ_CheXiao": log.error("æ£æ¥æ¤éå ¥åç±»å为ï¼{}", type); return true; case "JC_BG_BaoGao": log.error("æ£æ¥æ¥åå ¥åç±»å为ï¼{}", type); return addInspectBGService(dataMap); case "JY_SQ_ShenQing": log.error("æ£éªç³è¯·å ¥åç±»å为ï¼{}", type); return true; return addInspectService(dataMap); case "JY_SQ_CheXiao": log.error("æ£éªæ¤éå ¥åç±»å为ï¼{}", type); return true; case "JY_SQ_XiuGai": log.error("æ£éªä¿®æ¹å ¥åç±»åä¸ºè¾ ï¼{}", type); return true; return addInspectService(dataMap); case "JY_SQ_BiaoBenCJ": log.error("æ£éªæ æ¬ééå ¥åç±»å为ï¼{}", type); return true; @@ -1267,6 +1613,9 @@ case "JZ_ZY_ChuYuan": log.error("æ£è åºé¢å ¥åç±»å为ï¼{}", type); return addOutHospInfo(dataMap); case "BL_JL_ChuYuanJL": log.error("æ£è åºé¢è®°å½å ¥åç±»å为ï¼{}", type); return addOutHospJLInfo(dataMap); case "JZ_ZY_QuXiaoCY": log.error("åæ¶åºé¢å ¥åç±»å为ï¼{}", type); return cancelOutHospInfo(dataMap); smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,225 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.smartor.mapper.PatMedInspectionItemMapper"> <resultMap type="com.smartor.domain.PatMedInspectionItem" id="PatMedInspectionItemResult"> <result property="id" column="id"/> <result property="inspectionid" column="inspectionid"/> <result property="inspectionName" column="inspection_name"/> <result property="reportid" column="reportid"/> <result property="orgid" column="orgid"/> <result property="statuscode" column="statuscode"/> <result property="statusname" column="statusname"/> <result property="reporterid" column="reporterid"/> <result property="reportername" column="reportername"/> <result property="reportdate" column="reportdate"/> <result property="diagimpression" column="diagimpression"/> <result property="diagfindings" column="diagfindings"/> <result property="diagsuggestion" column="diagsuggestion"/> <result property="reporturl" column="reporturl"/> <result property="criticalFlag" column="critical_flag"/> <result property="criticalContent" column="critical_content"/> <result property="reportdeptid" column="reportdeptid"/> <result property="reportdeptname" column="reportdeptname"/> <result property="resultcode" column="resultcode"/> <result property="resultname" column="resultname"/> <result property="delFlag" column="del_flag"/> <result property="updateBy" column="update_by"/> <result property="updateTime" column="update_time"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="isupload" column="isupload"/> <result property="uploadTime" column="upload_time"/> <result property="pguid" column="pguid"/> <result property="guid" column="guid"/> <result property="pid" column="pid"/> </resultMap> <sql id="selectPatMedInspectionItemVo"> select id, inspectionid, inspection_name, reportid, orgid, statuscode, statusname, reporterid, reportername, reportdate, diagimpression, diagfindings, diagsuggestion, reporturl, critical_flag, critical_content, reportdeptid, reportdeptname, resultcode, resultname, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, pguid, guid, pid from pat_med_inspection_item </sql> <select id="selectPatMedInspectionItemList" parameterType="com.smartor.domain.PatMedInspectionItem" resultMap="PatMedInspectionItemResult"> <include refid="selectPatMedInspectionItemVo"/> <where> <if test="inspectionid != null and inspectionid != ''">and inspectionid = #{inspectionid}</if> <if test="inspectionName != null and inspectionName != ''">and inspection_name = #{inspectionName}</if> <if test="reportid != null and reportid != ''">and reportid = #{reportid}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="statuscode != null and statuscode != ''">and statuscode = #{statuscode}</if> <if test="statusname != null and statusname != ''">and statusname = #{statusname}</if> <if test="reporterid != null and reporterid != ''">and reporterid = #{reporterid}</if> <if test="reportername != null and reportername != ''">and reportername = #{reportername}</if> <if test="reportdate != null and reportdate != ''">and reportdate = #{reportdate}</if> <if test="diagimpression != null and diagimpression != ''">and diagimpression = #{diagimpression}</if> <if test="diagfindings != null and diagfindings != ''">and diagfindings = #{diagfindings}</if> <if test="diagsuggestion != null and diagsuggestion != ''">and diagsuggestion = #{diagsuggestion}</if> <if test="reporturl != null and reporturl != ''">and reporturl = #{reporturl}</if> <if test="criticalFlag != null and criticalFlag != ''">and critical_flag = #{criticalFlag}</if> <if test="criticalContent != null and criticalContent != ''">and critical_content = #{criticalContent}</if> <if test="reportdeptid != null and reportdeptid != ''">and reportdeptid = #{reportdeptid}</if> <if test="reportdeptname != null and reportdeptname != ''">and reportdeptname = #{reportdeptname}</if> <if test="resultcode != null and resultcode != ''">and resultcode = #{resultcode}</if> <if test="resultname != null and resultname != ''">and resultname = #{resultname}</if> <if test="delFlag != null and delFlag != ''">and del_flag = #{delFlag}</if> <if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if> <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if> <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if> <if test="createTime != null and createTime != ''">and create_time = #{createTime}</if> <if test="isupload != null and isupload != ''">and isupload = #{isupload}</if> <if test="uploadTime != null and uploadTime != ''">and upload_time = #{uploadTime}</if> <if test="pguid != null and pguid != ''">and pguid = #{pguid}</if> <if test="guid != null and guid != ''">and guid = #{guid}</if> <if test="pid != null and pid != ''">and pid = #{pid}</if> </where> -- order by update_time desc </select> <select id="selectPatMedInspectionItemById" parameterType="Long" resultMap="PatMedInspectionItemResult"> <include refid="selectPatMedInspectionItemVo"/> where id = #{id} </select> <insert id="insertPatMedInspectionItem" parameterType="com.smartor.domain.PatMedInspectionItem" useGeneratedKeys="true" keyProperty="id"> insert into pat_med_inspection_item <trim prefix="(" suffix=")" suffixOverrides=","> <if test="inspectionid != null">inspectionid,</if> <if test="inspectionName != null">inspection_name,</if> <if test="reportid != null">reportid,</if> <if test="orgid != null">orgid,</if> <if test="statuscode != null">statuscode,</if> <if test="statusname != null">statusname,</if> <if test="reporterid != null">reporterid,</if> <if test="reportername != null">reportername,</if> <if test="reportdate != null">reportdate,</if> <if test="diagimpression != null">diagimpression,</if> <if test="diagfindings != null">diagfindings,</if> <if test="diagsuggestion != null">diagsuggestion,</if> <if test="reporturl != null">reporturl,</if> <if test="criticalFlag != null">critical_flag,</if> <if test="criticalContent != null">critical_content,</if> <if test="reportdeptid != null">reportdeptid,</if> <if test="reportdeptname != null">reportdeptname,</if> <if test="resultcode != null">resultcode,</if> <if test="resultname != null">resultname,</if> <if test="delFlag != null">del_flag,</if> <if test="updateBy != null">update_by,</if> <if test="updateTime != null">update_time,</if> <if test="createBy != null">create_by,</if> <if test="createTime != null">create_time,</if> <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="inspectionid != null">#{inspectionid},</if> <if test="inspectionName != null">#{inspectionName},</if> <if test="reportid != null">#{reportid},</if> <if test="orgid != null">#{orgid},</if> <if test="statuscode != null">#{statuscode},</if> <if test="statusname != null">#{statusname},</if> <if test="reporterid != null">#{reporterid},</if> <if test="reportername != null">#{reportername},</if> <if test="reportdate != null">#{reportdate},</if> <if test="diagimpression != null">#{diagimpression},</if> <if test="diagfindings != null">#{diagfindings},</if> <if test="diagsuggestion != null">#{diagsuggestion},</if> <if test="reporturl != null">#{reporturl},</if> <if test="criticalFlag != null">#{criticalFlag},</if> <if test="criticalContent != null">#{criticalContent},</if> <if test="reportdeptid != null">#{reportdeptid},</if> <if test="reportdeptname != null">#{reportdeptname},</if> <if test="resultcode != null">#{resultcode},</if> <if test="resultname != null">#{resultname},</if> <if test="delFlag != null">#{delFlag},</if> <if test="updateBy != null">#{updateBy},</if> <if test="updateTime != null">#{updateTime},</if> <if test="createBy != null">#{createBy},</if> <if test="createTime != null">#{createTime},</if> <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="pguid != null">#{pguid},</if> <if test="guid != null">#{guid},</if> <if test="pid != null">#{pid}</if> </trim> </insert> <update id="updatePatMedInspectionItem" parameterType="com.smartor.domain.PatMedInspectionItem"> update pat_med_inspection_item <trim prefix="SET" suffixOverrides=","> <if test="inspectionid != null">inspectionid = #{inspectionid},</if> <if test="inspectionName != null">inspection_name = #{inspectionName},</if> <if test="reportid != null">reportid = #{reportid},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="statuscode != null">statuscode = #{statuscode},</if> <if test="statusname != null">statusname = #{statusname},</if> <if test="reporterid != null">reporterid = #{reporterid},</if> <if test="reportername != null">reportername = #{reportername},</if> <if test="reportdate != null">reportdate = #{reportdate},</if> <if test="diagimpression != null">diagimpression = #{diagimpression},</if> <if test="diagfindings != null">diagfindings = #{diagfindings},</if> <if test="diagsuggestion != null">diagsuggestion = #{diagsuggestion},</if> <if test="reporturl != null">reporturl = #{reporturl},</if> <if test="criticalFlag != null">critical_flag = #{criticalFlag},</if> <if test="criticalContent != null">critical_content = #{criticalContent},</if> <if test="reportdeptid != null">reportdeptid = #{reportdeptid},</if> <if test="reportdeptname != null">reportdeptname = #{reportdeptname},</if> <if test="resultcode != null">resultcode = #{resultcode},</if> <if test="resultname != null">resultname = #{resultname},</if> <if test="delFlag != null">del_flag = #{delFlag},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> <if test="createBy != null">create_by = #{createBy},</if> <if test="createTime != null">create_time = #{createTime},</if> <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> </trim> where id = #{id} </update> <delete id="deletePatMedInspectionItemById" parameterType="Long"> delete from pat_med_inspection_item where id = #{id} </delete> <delete id="deletePatMedInspectionItemByIds" parameterType="String"> delete from pat_med_inspection_item where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> </delete> </mapper> smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml
@@ -6,66 +6,92 @@ <resultMap type="com.smartor.domain.PatMedInspection" id="PatMedInspectionResult"> <result property="id" column="id"/> <result property="serialnum" column="serialnum"/> <result property="patid" column="patid"/> <result property="projecttype" column="projecttype"/> <result property="projectcode" column="projectcode"/> <result property="projectname" column="projectname"/> <result property="reporttime" column="reporttime"/> <result property="hospitalname" column="hospitalname"/> <result property="hospitalcode" column="hospitalcode"/> <result property="inhospno" column="inhospno"/> <result property="patidHis" column="patid_his"/> <result property="idcardno" column="idcardno"/> <result property="patname" column="patname"/> <result property="telcode" column="telcode"/> <result property="adviceId" column="adviceId"/> <result property="appliyid" column="appliyid"/> <result property="priority" column="priority"/> <result property="orgid" column="orgid"/> <result property="delFlag" column="del_flag"/> <result property="updateBy" column="update_by"/> <result property="updateTime" column="update_time"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="isupload" column="isupload"/> <result property="uploadTime" column="upload_time"/> <result property="projectid" column="projectid"/> <result property="applicationtime" column="applicationtime"/> <result property="visittype" column="visittype"/> <result property="visitid" column="visitid"/> <result property="schemestatus" column="schemestatus"/> <result property="isabnormal" column="isabnormal"/> <result property="reportconclusion" column="reportconclusion"/> <result property="schemetime" column="schemetime"/> <result property="drcode" column="drcode"/> <result property="drname" column="drname"/> <result property="deptcode" column="deptcode"/> <result property="deptname" column="deptname"/> <result property="deptid" column="deptid"/> <result property="opendate" column="opendate"/> <result property="operatorId" column="operator_id"/> <result property="operatorName" column="operator_name"/> <result property="operatorDate" column="operator_date"/> <result property="money" column="money"/> <result property="updateBy" column="update_by"/> <result property="updateDate" column="update_date"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="startTime" column="start_time"/> <result property="projectId" column="project_id"/> <result property="projectName" column="project_name"/> <result property="diagid" column="diagid"/> <result property="diagname" column="diagname"/> <result property="partId" column="part_id"/> <result property="partName" column="part_name"/> <result property="typeId" column="type_id"/> <result property="typeName" column="type_name"/> <result property="filmFlag" column="film_flag"/> <result property="bedFlag" column="bed_flag"/> <result property="pushFlag" column="push_flag"/> <result property="urgentFlag" column="urgent_flag"/> <result property="nostartFlag" column="nostart_flag"/> <result property="pguid" column="pguid"/> <result property="guid" column="guid"/> <result property="pid" column="pid"/> </resultMap> <sql id="selectPatMedInspectionVo"> select id, serialnum, guid, patid, projecttype, projectcode, projectname, reporttime, hospitalname, hospitalcode, inhospno, patid_his, idcardno, patname, telcode, adviceId, appliyid, priority, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, projectid, applicationtime, visittype, visitid, schemestatus, isabnormal, reportconclusion, schemetime, drcode, drname, deptcode, deptname, deptid opendate, operator_id, operator_name, operator_date, money, update_by, update_date, create_by, create_time, start_time, project_id, project_name, diagid, diagname, part_id, part_name, type_id, type_name, film_flag, bed_flag, push_flag, urgent_flag, nostart_flag, pguid, guid, pid from pat_med_inspection </sql> @@ -73,35 +99,49 @@ resultMap="PatMedInspectionResult"> <include refid="selectPatMedInspectionVo"/> <where> <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if> <if test="patid != null ">and patid = #{patid}</if> <if test="projecttype != null ">and projecttype = #{projecttype}</if> <if test="projectcode != null and projectcode != ''">and projectcode = #{projectcode}</if> <if test="projectname != null and projectname != ''">and projectname like concat('%', #{projectname}, '%') </if> <if test="reporttime != null ">and reporttime = #{reporttime}</if> <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname}, '%') </if> <if test="hospitalcode != null and hospitalcode != ''">and hospitalcode = #{hospitalcode}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="isupload != null ">and isupload = #{isupload}</if> <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> <if test="projectid != null ">and projectid = #{projectid}</if> <if test="applicationtime != null ">and applicationtime = #{applicationtime}</if> <if test="visittype != null ">and visittype = #{visittype}</if> <if test="visitid != null ">and visitid = #{visitid}</if> <if test="schemestatus != null ">and schemestatus = #{schemestatus}</if> <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if> <if test="reportconclusion != null and reportconclusion != ''">and reportconclusion = #{reportconclusion} </if> <if test="schemetime != null ">and schemetime = #{schemetime}</if> <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if> <if test="deptname != null and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if> <if test="deptid != null ">and deptid = #{deptid}</if> <if test="inhospno != null">and inhospno = #{inhospno}</if> <if test="patidHis != null">and patid_his = #{patidHis}</if> <if test="idcardno != null">and idcardno = #{idcardno}</if> <if test="patname != null">and patname = #{patname}</if> <if test="telcode != null ">and telcode = #{telcode}</if> <if test="adviceId != null">and adviceId = #{adviceId}</if> <if test="appliyid != null">and appliyid = #{appliyid}</if> <if test="priority != null">and priority = #{priority}</if> <if test="orgid != null">and orgid = #{orgid}</if> <if test="delFlag != null">and del_flag = #{delFlag}</if> <if test="drcode != null">and drcode = #{drcode}</if> <if test="drname != null">and drname = #{drname}</if> <if test="deptcode != null">and deptcode = #{deptcode}</if> <if test="deptname != null">and deptname = #{deptname}</if> <if test="opendate != null">and opendate = #{opendate}</if> <if test="operatorId != null">and operator_id = #{operatorId}</if> <if test="operatorName != null">and operator_name = #{operatorName}</if> <if test="operatorDate != null">and operator_date = #{operatorDate}</if> <if test="money != null">and money = #{money}</if> <if test="updateBy != null">and update_by = #{updateBy}</if> <if test="updateDate != null">and update_date = #{updateDate}</if> <if test="createBy != null">and create_by = #{createBy}</if> <if test="createTime != null">and create_time = #{createTime}</if> <if test="startTime != null">and start_time = #{startTime}</if> <if test="projectId != null">and project_id = #{projectId}</if> <if test="projectName != null">and project_name = #{projectName}</if> <if test="diagid != null">and diagid = #{diagid}</if> <if test="diagname != null">and diagname = #{diagname}</if> <if test="partId != null">and part_id = #{partId}</if> <if test="partName != null">and part_name = #{partName}</if> <if test="typeId != null">and type_id = #{typeId}</if> <if test="typeName != null">and type_name = #{type}</if> <if test="filmFlag != null">and film_flag = #{filmFlag}</if> <if test="bedFlag != null">and bed_flag = #{bedFlag}</if> <if test="pushFlag != null">and push_flag = #{pushFlag}</if> <if test="urgentFlag != null">and urgent_flag = #{urgentFlag}</if> <if test="nostartFlag != null">and nostart_flag = #{nostartFlag}</if> <if test="pguid != null">and pguid = #{pguid}</if> <if test="guid != null">and guid = #{guid}</if> <if test="pid != null">and pid = #{pid}</if> </where> order by update_time desc -- order by update_time desc </select> <select id="selectPatMedInspectionById" parameterType="Long" resultMap="PatMedInspectionResult"> @@ -113,100 +153,139 @@ keyProperty="id"> insert into pat_med_inspection <trim prefix="(" suffix=")" suffixOverrides=","> <if test="serialnum != null">serialnum,</if> <if test="patid != null">patid,</if> <if test="projecttype != null">projecttype,</if> <if test="projectcode != null">projectcode,</if> <if test="projectname != null">projectname,</if> <if test="reporttime != null">reporttime,</if> <if test="hospitalname != null">hospitalname,</if> <if test="hospitalcode != null">hospitalcode,</if> <if test="inhospno != null">inhospno,</if> <if test="patidHis != null">patid_his,</if> <if test="idcardno != null">idcardno,</if> <if test="patname != null">patname,</if> <if test="telcode != null">telcode,</if> <if test="adviceId != null">adviceId,</if> <if test="appliyid != null">appliyid,</if> <if test="priority != null">priority,</if> <if test="orgid != null">orgid,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="updateBy != null">update_by,</if> <if test="updateTime != null">update_time,</if> <if test="createBy != null">create_by,</if> <if test="createTime != null">create_time,</if> <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> <if test="projectid != null">projectid,</if> <if test="applicationtime != null">applicationtime,</if> <if test="visittype != null">visittype,</if> <if test="visitid != null">visitid,</if> <if test="schemestatus != null">schemestatus,</if> <if test="isabnormal != null">isabnormal,</if> <if test="reportconclusion != null">reportconclusion,</if> <if test="schemetime != null">schemetime,</if> <if test="delFlag != null">del_flag,</if> <if test="drcode != null">drcode,</if> <if test="drname != null">drname,</if> <if test="deptcode != null">deptcode,</if> <if test="deptname != null">deptname,</if> <if test="deptid != null">deptid,</if> <if test="opendate != null">opendate,</if> <if test="operatorId != null">operator_id,</if> <if test="operatorName != null">operator_name,</if> <if test="operatorDate != null">operator_date,</if> <if test="money != null">money,</if> <if test="updateBy != null">update_by,</if> <if test="updateDate != null">update_date,</if> <if test="createBy != null">create_by,</if> <if test="createTime != null">create_time,</if> <if test="startTime != null">start_time,</if> <if test="projectId != null">project_id,</if> <if test="projectName != null">project_name,</if> <if test="diagid != null">diagid,</if> <if test="diagname != null">diagname,</if> <if test="partId != null">part_id,</if> <if test="partName != null">part_name,</if> <if test="typeId != null">type_id,</if> <if test="typeName != null">type_name,</if> <if test="filmFlag != null">film_flag,</if> <if test="bedFlag != null">bed_flag,</if> <if test="pushFlag != null">push_flag,</if> <if test="urgentFlag != null">urgent_flag,</if> <if test="nostartFlag != null">nostart_flag,</if> <if test="pguid != null">pguid,</if> <if test="guid != null">guid,</if> <if test="pid != null">pid,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="serialnum != null">#{serialnum},</if> <if test="patid != null">#{patid},</if> <if test="projecttype != null">#{projecttype},</if> <if test="projectcode != null">#{projectcode},</if> <if test="projectname != null">#{projectname},</if> <if test="reporttime != null">#{reporttime},</if> <if test="hospitalname != null">#{hospitalname},</if> <if test="hospitalcode != null">#{hospitalcode},</if> <if test="inhospno != null">#{inhospno},</if> <if test="patidHis != null">#{patidHis},</if> <if test="idcardno != null">#{idcardno},</if> <if test="patname != null">#{patname},</if> <if test="telcode != null">#{telcode},</if> <if test="adviceId != null">#{adviceId},</if> <if test="appliyid != null">#{appliyid},</if> <if test="priority != null">#{priority},</if> <if test="orgid != null">#{orgid},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="updateBy != null">#{updateBy},</if> <if test="updateTime != null">#{updateTime},</if> <if test="createBy != null">#{createBy},</if> <if test="createTime != null">#{createTime},</if> <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="projectid != null">#{projectid},</if> <if test="applicationtime != null">#{applicationtime},</if> <if test="visittype != null">#{visittype},</if> <if test="visitid != null">#{visitid},</if> <if test="schemestatus != null">#{schemestatus},</if> <if test="isabnormal != null">#{isabnormal},</if> <if test="reportconclusion != null">#{reportconclusion},</if> <if test="schemetime != null">#{schemetime},</if> <if test="delFlag != null">#{delFlag},</if> <if test="drcode != null">#{drcode},</if> <if test="drname != null">#{drname},</if> <if test="deptcode != null">#{deptcode},</if> <if test="deptname != null">#{deptname},</if> <if test="deptid != null">#{deptid},</if> <if test="opendate != null">#{opendate},</if> <if test="operatorId != null">#{operatorId},</if> <if test="operatorName != null">#{operatorName},</if> <if test="operatorDate != null">#{operatorDate},</if> <if test="money != null">#{money},</if> <if test="updateBy != null">#{updateBy},</if> <if test="updateDate != null">#{updateDate},</if> <if test="createBy != null">#{createBy},</if> <if test="createTime != null">#{createTime},</if> <if test="startTime != null">#{startTime},</if> <if test="projectId != null">#{projectId},</if> <if test="projectName != null">#{projectName},</if> <if test="diagid != null">#{diagid},</if> <if test="diagname != null">#{diagname},</if> <if test="partId != null">#{partId},</if> <if test="partName != null">#{partName},</if> <if test="typeId != null">#{typeId},</if> <if test="typeName != null">#{typeName},</if> <if test="filmFlag != null">#{filmFlag},</if> <if test="bedFlag != null">#{bedFlag},</if> <if test="pushFlag != null">#{pushFlag},</if> <if test="urgentFlag != null">#{urgentFlag},</if> <if test="nostartFlag != null">#{nostartFlag},</if> <if test="pguid != null">#{pguid},</if> <if test="guid != null">#{guid},</if> <if test="pid != null">#{pid},</if> </trim> </insert> <update id="updatePatMedInspection" parameterType="com.smartor.domain.PatMedInspection"> update pat_med_inspection <trim prefix="SET" suffixOverrides=","> <if test="serialnum != null">serialnum = #{serialnum},</if> <if test="patid != null">patid = #{patid},</if> <if test="projecttype != null">projecttype = #{projecttype},</if> <if test="projectcode != null">projectcode = #{projectcode},</if> <if test="projectname != null">projectname = #{projectname},</if> <if test="reporttime != null">reporttime = #{reporttime},</if> <if test="hospitalname != null">hospitalname = #{hospitalname},</if> <if test="hospitalcode != null">hospitalcode = #{hospitalcode},</if> <if test="inhospno != null">inhospno = #{inhospno},</if> <if test="patidHis != null">patid_his = #{patidHis},</if> <if test="idcardno != null">idcardno = #{idcardno},</if> <if test="patname != null">patname = #{patname},</if> <if test="telcode != null">telcode = #{telcode},</if> <if test="adviceId != null">adviceId = #{adviceId},</if> <if test="appliyid != null">appliyid = #{appliyid},</if> <if test="priority != null">priority = #{priority},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> <if test="createBy != null">create_by = #{createBy},</if> <if test="createTime != null">create_time = #{createTime},</if> <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="projectid != null">projectid = #{projectid},</if> <if test="applicationtime != null">applicationtime = #{applicationtime},</if> <if test="visittype != null">visittype = #{visittype},</if> <if test="visitid != null">visitid = #{visitid},</if> <if test="schemestatus != null">schemestatus = #{schemestatus},</if> <if test="isabnormal != null">isabnormal = #{isabnormal},</if> <if test="reportconclusion != null">reportconclusion = #{reportconclusion},</if> <if test="schemetime != null">schemetime = #{schemetime},</if> <if test="delFlag != null">del_flag = #{delFlag},</if> <if test="drcode != null">drcode = #{drcode},</if> <if test="drname != null">drname = #{drname},</if> <if test="deptcode != null">deptcode = #{deptcode},</if> <if test="deptname != null">deptname = #{deptname},</if> <if test="deptid != null">deptid = #{deptid},</if> <if test="guid != null">guid = #{guid},</if> <if test="opendate != null">opendate = #{opendate},</if> <if test="operatorId != null">operator_id = #{operatorId},</if> <if test="operatorName != null">operator_name = #{operatorName},</if> <if test="operatorDate != null">operator_date = #{operatorDate},</if> <if test="money != null">money = #{money},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateDate != null">update_date = #{updateDate},</if> <if test="createBy != null">create_by = #{createBy},</if> <if test="createTime != null">create_time = #{createTime},</if> <if test="startTime != null">start_time = #{startTime},</if> <if test="projectId != null">project_id = #{projectId},</if> <if test="projectName != null">project_name = #{projectName},</if> <if test="diagid != null">diagid = #{diagid},</if> <if test="diagname != null">diagname = #{diagname},</if> <if test="partId != null">part_id = #{partId},</if> <if test="partName != null">part_name = #{partName},</if> <if test="typeId != null">type_id = #{typeId},</if> <if test="typeName != null">type_name = #{typeName},</if> <if test="filmFlag != null">film_flag = #{filmFlag},</if> <if test="bedFlag != null">bed_flag = #{bedFlag},</if> <if test="pushFlag != null">push_flag = #{pushFlag},</if> <if test="urgentFlag != null">urgent_flag = #{urgentFlag},</if> <if test="nostartFlag != null">nostart_flag = #{nostartFlag},</if> </trim> where id = #{id} where projecttype = #{projecttype} and inhospno = #{inhospno} and patid_his = #{patidHis} and idcardno = #{idcardno} </update> <delete id="deletePatMedInspectionById" parameterType="Long">