From 88eb0ca4a8a7edd09dd24a68559437eae0b83e1c Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 15 Dec 2020 13:53:36 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 21 ++++++++++++++++++++ .../platform/pojo/AntenatalExaminationModel.java | 20 +++++++++++++++++++ .../lyms/platform/pojo/CancerScreeningModel.java | 22 +++++++++++++++++++++ .../lyms/platform/pojo/CervicalCancerModel.java | 20 +++++++++++++++++++ .../lyms/platform/pojo/FamilyPlanningModel.java | 20 +++++++++++++++++++ .../web/facade/AntenatalExaminationFacade.java | 7 +++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 5 +++++ .../web/facade/DischargeAbstractFacade.java | 2 ++ .../operate/web/facade/FamilyPlanningFacade.java | 9 +++++++++ .../operate/web/request/AntExcAddRequest.java | 23 ++++++++++++++++++++++ .../web/request/BabyBookbuildingAddRequest.java | 21 ++++++++++++++++++++ .../operate/web/request/FamilyPlanningRequest.java | 20 +++++++++++++++++++ .../web/result/AntenatalExaminationResult.java | 20 +++++++++++++++++++ .../operate/web/result/AntexChuResult.java | 20 +++++++++++++++++++ .../operate/web/result/BabyBuildResult.java | 20 +++++++++++++++++++ .../operate/web/result/BabyPageResult.java | 22 +++++++++++++++++++++ .../operate/web/result/FamilyPlanningResult.java | 21 ++++++++++++++++++++ 17 files changed, 293 insertions(+) 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 bd67815..8db4569 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 @@ -467,6 +467,27 @@ public class AntExChuModel extends BaseModel { //检查结果 大同 private String checkResult; + //医生签名 + private String doctorSign; + + //患者签名 + private String patientSign; + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } public String getCheckResult() { return checkResult; 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 80fdec3..4b71ce7 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 @@ -15,7 +15,11 @@ import java.util.Map; */ @Document(collection = "lyms_antex") public class AntenatalExaminationModel extends BaseModel { + //医生签名 + private String doctorSign; + //患者签名 + private String patientSign; /** * start * 遵化需求新增字段 @@ -1437,6 +1441,22 @@ public class AntenatalExaminationModel extends BaseModel { return parentId; } + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } + public void setParentId(String parentId) { this.parentId = parentId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java index 1d97e1d..ae1fa21 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -199,6 +199,28 @@ public class CancerScreeningModel extends BaseModel { */ private Integer yn; + //医生签名 + private String doctorSign; + + //患者签名 + private String patientSign; + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } + public Date getRxlJcrq() { return rxlJcrq; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java index bd31e14..cf64a7e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java @@ -91,7 +91,27 @@ public class CervicalCancerModel extends BaseModel { */ private String createUser; + //医生签名 + private String doctorSign; + //患者签名 + private String patientSign; + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } public String getHpvjc() { return hpvjc; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java index d0a4cdc..0b4ea3c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java @@ -157,7 +157,27 @@ public class FamilyPlanningModel extends BaseModel { private Map qcjyqxt; + //医生签名 + private String doctorSign; + //患者签名 + private String patientSign; + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } public String getId() { return id; 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 7b3b999..f120fd6 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 @@ -3798,6 +3798,10 @@ public class AntenatalExaminationFacade { Assert.notNull(examinationModel, "id不存在."); AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult(); antenatalExaminationResult.convertToResult(examinationModel); + + antenatalExaminationResult.setDoctorSign(examinationModel.getDoctorSign()); + antenatalExaminationResult.setPatientSign(examinationModel.getPatientSign()); + try { //筛查结果 if (CollectionUtils.isNotEmpty(examinationModel.getScreenResult())) { @@ -3942,6 +3946,9 @@ public class AntenatalExaminationFacade { antexChuResult.convertToResult(antExChuModel); + antexChuResult.setDoctorSign(antExChuModel.getDoctorSign()); + antexChuResult.setPatientSign(antExChuModel.getPatientSign()); + try { //筛查结果 if (CollectionUtils.isNotEmpty(antExChuModel.getScreenResult())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index fd92f55..be4aad3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1248,6 +1248,8 @@ public class BabyBookbuildingFacade { BabyModel bm = new BabyModel(); //遵化定制 路北辖区状态 bm.setZhlbxqState(b.getZhlbxqState()); + bm.setKouqNew(b.getKouqNew()); + bm.setTxngNew(b.getTxngNew()); if (b.getDataStatus() != null && b.getDataStatus() == 1) { bm.setDataStatus(0); @@ -1607,6 +1609,9 @@ public class BabyBookbuildingFacade { BabyModel model = models.get(0); result = getBabyBuildResult(model); result.setZhlbxqState(model.getZhlbxqState()); + result.setKouqNew(model.getKouqNew()); + result.setTxngNew(model.getTxngNew()); + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List ) baseResponse.getObject(); result.setPatientSerResults(patientSerResults); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 6e06596..b453fb9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -177,6 +177,8 @@ public class DischargeAbstractFacade extends BaseServiceImpl { List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新，后就无法控制了 BabyModel babyModel = setBabyModel(dabm, b); + babyModel.setTxngNew(dabm.getTxngNew()); + babyModel.setKouqNew(dabm.getKouqNew()); if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){ babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java index d8e111c..fc75e0e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java @@ -81,6 +81,9 @@ public class FamilyPlanningFacade extends BaseServiceImpl { model.setVcCardNo(residentsArchiveModel.getVcCardNo()); //createDate,hospitalId调用外添加赋值 } + model.setDoctorSign(request.getDoctorSign()); + model.setPatientSign(request.getPatientSign()); + model.setSsxm(request.getSsxm()); model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); model.setCheckDoctor(request.getCheckDoctor()); @@ -207,6 +210,9 @@ public class FamilyPlanningFacade extends BaseServiceImpl { FamilyPlanningResult familyPlanningResult = new FamilyPlanningResult(); familyPlanningResult.convertToResult(familyPlanningModel); + familyPlanningResult.setDoctorSign(familyPlanningModel.getDoctorSign()); + familyPlanningResult.setPatientSign(familyPlanningModel.getPatientSign()); + if (StringUtils.isNotEmpty(familyPlanningModel.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(familyPlanningModel.getCheckDoctor())); if (users != null && StringUtils.isNotEmpty(users.getName())) { @@ -254,6 +260,9 @@ public class FamilyPlanningFacade extends BaseServiceImpl { FamilyPlanningResult familyPlanningResult = new FamilyPlanningResult(); familyPlanningResult.convertToResult(familyPlanningModel); + familyPlanningResult.setDoctorSign(familyPlanningModel.getDoctorSign()); + familyPlanningResult.setPatientSign(familyPlanningModel.getPatientSign()); + familyPlanningResult.setCheckDoctor(familyPlanningModel.getCheckDoctor()); br.setData(familyPlanningResult); br.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 9c5eade..821cf97 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -461,6 +461,27 @@ public class AntExcAddRequest implements IBasicRequestConvert { //检查结果 大同 private String checkResult; + //医生签名 + private String doctorSign; + + //患者签名 + private String patientSign; + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } public String getCheckResult() { return checkResult; @@ -2060,6 +2081,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + antExChuModel.setDoctorSign(doctorSign); + antExChuModel.setPatientSign(patientSign); antExChuModel.setZyzlState(zyzlState); antExChuModel.setZyzlContent(zyzlContent); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 5de9e82..fdc99e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -326,10 +326,15 @@ public class BabyBookbuildingAddRequest { private Integer esfs; //听性脑干（1通过/2未通过） private Integer txng; + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) + private Map txngNew; //耳聋基因（1通过/2未通过） private Integer eljy; //口腔（1通过/2未通过） private Integer kouq; + //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ + private Map kouqNew; + //是否接种卡介苗 private Integer isBCG; //卡介苗接种日期 @@ -371,6 +376,14 @@ public class BabyBookbuildingAddRequest { private String openDisease; private String openDiseaseType; //1一个月 12一年 + public void setTxngNew(Map txngNew) { + this.txngNew = txngNew; + } + + public void setKouqNew(Map kouqNew) { + this.kouqNew = kouqNew; + } + public String getOpenDiseaseType() { return openDiseaseType; } @@ -391,6 +404,14 @@ public class BabyBookbuildingAddRequest { return liveType; } + public Map getTxngNew() { + return txngNew; + } + + public Map getKouqNew() { + return kouqNew; + } + public void setLiveType(String liveType) { this.liveType = liveType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FamilyPlanningRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FamilyPlanningRequest.java index a160c0b..d384c66 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FamilyPlanningRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FamilyPlanningRequest.java @@ -153,7 +153,11 @@ public class FamilyPlanningRequest { /*取环术字段*/ //取出节育器形态：key:state zc正常□ yc异常□（details 1嵌顿/2散开/3断裂/4下移/5残留/ qt 其他____） private Map qcjyqxt; + //医生签名 + private String doctorSign; + //患者签名 + private String patientSign; public String getId() { return id; } @@ -182,6 +186,22 @@ public class FamilyPlanningRequest { return pid; } + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } + public void setPid(String pid) { this.pid = pid; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 469d6ba..eba01da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -18,7 +18,11 @@ import java.util.Map; * Created by Administrator on 2016/6/15 0015. */ public class AntenatalExaminationResult implements IBasicResultConvert { + //医生签名 + private String doctorSign; + //患者签名 + private String patientSign; /** * start * 遵化需求新增字段 @@ -1500,6 +1504,22 @@ public class AntenatalExaminationResult implements IBasicResultConvert txngNew; + //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ + private Map kouqNew; // 母亲高危因素 private List> mHighRiskReason; // 儿童高危因素标记 @@ -398,6 +402,22 @@ public class BabyBuildResult { return weakSonInfo; } + public Map getTxngNew() { + return txngNew; + } + + public void setTxngNew(Map txngNew) { + this.txngNew = txngNew; + } + + public Map getKouqNew() { + return kouqNew; + } + + public void setKouqNew(Map kouqNew) { + this.kouqNew = kouqNew; + } + public void setWeakSonInfo(List weakSonInfo) { this.weakSonInfo = weakSonInfo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index fd857a7..05e1607 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -22,6 +22,10 @@ import java.util.Map; * Created by lqy on 2016/6/17. */ public class BabyPageResult implements IBasicResultConvert { + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) + private Map txngNew; + //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ + private Map kouqNew; // 儿童高危因素标记 private List babyHighRiskReason; @@ -1203,10 +1207,28 @@ public class BabyPageResult implements IBasicResultConvert getTxngNew() { + return txngNew; + } + + public void setTxngNew(Map txngNew) { + this.txngNew = txngNew; + } + + public Map getKouqNew() { + return kouqNew; + } + + public void setKouqNew(Map kouqNew) { + this.kouqNew = kouqNew; + } + @Override public BabyPageResult convertToResult(BabyModel destModel) { List list = destModel.getmHighRiskReason(); setZhlbxqState(destModel.getZhlbxqState()); + setTxngNew(destModel.getTxngNew()); + setKouqNew(destModel.getKouqNew()); /*滦平 start */ setEsfs(destModel.getEsfs()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FamilyPlanningResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FamilyPlanningResult.java index e79e118..718f17c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FamilyPlanningResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FamilyPlanningResult.java @@ -148,10 +148,31 @@ public class FamilyPlanningResult implements IBasicResultConvert qcjyqxt; + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getPatientSign() { + return patientSign; + } + + public void setPatientSign(String patientSign) { + this.patientSign = patientSign; + } + public String getId() { return id; } -- 1.8.3.1