diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 531bf76..6ef557c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -4,7 +4,6 @@ import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -102,6 +101,18 @@ public class AntExChuModel extends BaseModel { private Integer abortionZR; //人工流产 private Integer abortionRG; + /** + * 其他的诊断意见 + */ + private String diagnosisOther; + + public String getDiagnosisOther() { + return diagnosisOther; + } + + public void setDiagnosisOther(String diagnosisOther) { + this.diagnosisOther = diagnosisOther; + } public String getBarCode() { return barCode; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 4a89f43..e250e19 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -6,7 +6,6 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; -import java.util.Map; /** * 产前检查 @@ -84,6 +83,10 @@ public class AntenatalExaminationModel extends BaseModel { private String typeYc; //处理意见 private String treatmentOpinion; + /** + * 其他的诊断意见 + */ + private String diagnosisOther; //指导 private String guide; //产检医生 @@ -100,6 +103,14 @@ public class AntenatalExaminationModel extends BaseModel { //操作人 private Integer operator; + public String getDiagnosisOther() { + return diagnosisOther; + } + + public void setDiagnosisOther(String diagnosisOther) { + this.diagnosisOther = diagnosisOther; + } + public String getBarCode() { return barCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index a44826b..ba87c8d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -238,7 +238,6 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(antExAddRequest.getId())) { - model.setHospitalId(hospitalId); model.setOperator(userId); antenatalExaminationService.updateOneAnt(model, antExAddRequest.getId()); @@ -266,7 +265,6 @@ public class AntenatalExaminationFacade { //复诊,修改产检管理 antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2); } else { - model.setOperator(userId); model.setYn(YnEnums.YES.getId()); model.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index edc150f..bf7d0c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -21,7 +21,6 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.PremaritalCheckup; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.pojo.SmsConfigModel; @@ -494,7 +493,25 @@ public class ResidentsArchiveFacade{ result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class)); result.setVcCardNo(model.getVcCardNo()); - result.setBuildDoctor(model.getBuildDoctor()); + if (StringUtils.isNotEmpty( model.getBuildDoctor())){ + Users u = usersService.getUsers(Integer.valueOf(model.getBuildDoctor())); + if(u!=null){ + Map doctInfo = new HashMap<>(); + doctInfo.put("id",String.valueOf(u.getId())); + doctInfo.put("name",u.getName()); + result.setBuildDoctor(doctInfo); + }else{ + Map doctInfo = new HashMap<>(); + doctInfo.put("id",String.valueOf(u.getId())); + result.setBuildDoctor(doctInfo); + } + }else{ + Map doctInfo = new HashMap<>(); + doctInfo.put("id",String.valueOf(model.getBuildDoctor())); + result.setBuildDoctor(doctInfo); + } + + result.setBuildDay(DateUtil.getyyyy_MM_dd(model.getBuildDay())); result.setCreated(model.getCreated()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index ab9a7a6..6506ff7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -279,6 +279,7 @@ public class ViewFacade { /* 基本信息 */ //孕妇基本信息 map.put("id",data.getId()); + map.put("diagnosisOther",data.getDiagnosisOther()); map.put("username",patients.getUsername()); map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI)); @@ -637,6 +638,7 @@ public class ViewFacade { /* 基本信息 */ //孕妇基本信息 map.put("id",data.getId()); + map.put("diagnosisOther",data.getDiagnosisOther()); map.put("username",patients.getUsername()); map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 3d2922c..17fe8d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -19,6 +19,10 @@ public class AntExAddRequest implements IBasicRequestConvert { private String couponCode; private Integer couponType; + /** + * 其他的诊断意见 + */ + private String diagnosisOther; + + public String getDiagnosisOther() { + return diagnosisOther; + } + + public void setDiagnosisOther(String diagnosisOther) { + this.diagnosisOther = diagnosisOther; + } public String getCouponCode() { return couponCode; @@ -903,6 +915,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel=new AntExChuModel(); + antExChuModel.setDiagnosisOther(diagnosisOther); antExChuModel.setBg(bg); antExChuModel.setBarCode(barCode); antExChuModel.setId(id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java index 7890c4f..a6c5f4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java @@ -78,7 +78,7 @@ public class ResidentsArchiveResult { //就诊卡号 private String vcCardNo; //建档人 - private String buildDoctor; + private Map buildDoctor; //建档日期 private String buildDay; @@ -347,11 +347,11 @@ public class ResidentsArchiveResult { this.vcCardNo = vcCardNo; } - public String getBuildDoctor() { + public Map getBuildDoctor() { return buildDoctor; } - public void setBuildDoctor(String buildDoctor) { + public void setBuildDoctor(Map buildDoctor) { this.buildDoctor = buildDoctor; }