jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 88eb0ca4a8a7edd09dd24a68559437eae0b83e1c

Authored by wtt
1 parent 3963178047
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 17 changed files with 293 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 88eb0ca
... ... @@ -467,6 +467,27 @@
467 467  
468 468 //检查结果 大同
469 469 private String checkResult;
  470 + //医生签名
  471 + private String doctorSign;
  472 +
  473 + //患者签名
  474 + private String patientSign;
  475 +
  476 + public String getDoctorSign() {
  477 + return doctorSign;
  478 + }
  479 +
  480 + public void setDoctorSign(String doctorSign) {
  481 + this.doctorSign = doctorSign;
  482 + }
  483 +
  484 + public String getPatientSign() {
  485 + return patientSign;
  486 + }
  487 +
  488 + public void setPatientSign(String patientSign) {
  489 + this.patientSign = patientSign;
  490 + }
470 491  
471 492 public String getCheckResult() {
472 493 return checkResult;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 88eb0ca
... ... @@ -15,7 +15,11 @@
15 15 */
16 16 @Document(collection = "lyms_antex")
17 17 public class AntenatalExaminationModel extends BaseModel {
  18 + //医生签名
  19 + private String doctorSign;
18 20  
  21 + //患者签名
  22 + private String patientSign;
19 23 /**
20 24 * start
21 25 * 遵化需求新增字段
... ... @@ -1435,6 +1439,22 @@
1435 1439  
1436 1440 public String getParentId() {
1437 1441 return parentId;
  1442 + }
  1443 +
  1444 + public String getDoctorSign() {
  1445 + return doctorSign;
  1446 + }
  1447 +
  1448 + public void setDoctorSign(String doctorSign) {
  1449 + this.doctorSign = doctorSign;
  1450 + }
  1451 +
  1452 + public String getPatientSign() {
  1453 + return patientSign;
  1454 + }
  1455 +
  1456 + public void setPatientSign(String patientSign) {
  1457 + this.patientSign = patientSign;
1438 1458 }
1439 1459  
1440 1460 public void setParentId(String parentId) {
platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java View file @ 88eb0ca
... ... @@ -199,6 +199,28 @@
199 199 */
200 200 private Integer yn;
201 201  
  202 + //医生签名
  203 + private String doctorSign;
  204 +
  205 + //患者签名
  206 + private String patientSign;
  207 +
  208 + public String getDoctorSign() {
  209 + return doctorSign;
  210 + }
  211 +
  212 + public void setDoctorSign(String doctorSign) {
  213 + this.doctorSign = doctorSign;
  214 + }
  215 +
  216 + public String getPatientSign() {
  217 + return patientSign;
  218 + }
  219 +
  220 + public void setPatientSign(String patientSign) {
  221 + this.patientSign = patientSign;
  222 + }
  223 +
202 224 public Date getRxlJcrq() {
203 225 return rxlJcrq;
204 226 }
platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java View file @ 88eb0ca
... ... @@ -91,7 +91,27 @@
91 91 */
92 92 private String createUser;
93 93  
  94 + //医生签名
  95 + private String doctorSign;
94 96  
  97 + //患者签名
  98 + private String patientSign;
  99 +
  100 + public String getDoctorSign() {
  101 + return doctorSign;
  102 + }
  103 +
  104 + public void setDoctorSign(String doctorSign) {
  105 + this.doctorSign = doctorSign;
  106 + }
  107 +
  108 + public String getPatientSign() {
  109 + return patientSign;
  110 + }
  111 +
  112 + public void setPatientSign(String patientSign) {
  113 + this.patientSign = patientSign;
  114 + }
95 115  
96 116 public String getHpvjc() {
97 117 return hpvjc;
platform-dal/src/main/java/com/lyms/platform/pojo/FamilyPlanningModel.java View file @ 88eb0ca
... ... @@ -157,7 +157,27 @@
157 157 private Map <String, Object> qcjyqxt;
158 158  
159 159  
  160 + //医生签名
  161 + private String doctorSign;
160 162  
  163 + //患者签名
  164 + private String patientSign;
  165 +
  166 + public String getDoctorSign() {
  167 + return doctorSign;
  168 + }
  169 +
  170 + public void setDoctorSign(String doctorSign) {
  171 + this.doctorSign = doctorSign;
  172 + }
  173 +
  174 + public String getPatientSign() {
  175 + return patientSign;
  176 + }
  177 +
  178 + public void setPatientSign(String patientSign) {
  179 + this.patientSign = patientSign;
  180 + }
161 181  
162 182 public String getId() {
163 183 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 88eb0ca
... ... @@ -3798,6 +3798,10 @@
3798 3798 Assert.notNull(examinationModel, "id不存在.");
3799 3799 AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult();
3800 3800 antenatalExaminationResult.convertToResult(examinationModel);
  3801 +
  3802 + antenatalExaminationResult.setDoctorSign(examinationModel.getDoctorSign());
  3803 + antenatalExaminationResult.setPatientSign(examinationModel.getPatientSign());
  3804 +
3801 3805 try {
3802 3806 //筛查结果
3803 3807 if (CollectionUtils.isNotEmpty(examinationModel.getScreenResult())) {
... ... @@ -3941,6 +3945,9 @@
3941 3945 }
3942 3946  
3943 3947 antexChuResult.convertToResult(antExChuModel);
  3948 +
  3949 + antexChuResult.setDoctorSign(antExChuModel.getDoctorSign());
  3950 + antexChuResult.setPatientSign(antExChuModel.getPatientSign());
3944 3951  
3945 3952 try {
3946 3953 //筛查结果
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 88eb0ca
... ... @@ -1248,6 +1248,8 @@
1248 1248 BabyModel bm = new BabyModel();
1249 1249 //遵化定制 路北辖区状态
1250 1250 bm.setZhlbxqState(b.getZhlbxqState());
  1251 + bm.setKouqNew(b.getKouqNew());
  1252 + bm.setTxngNew(b.getTxngNew());
1251 1253  
1252 1254 if (b.getDataStatus() != null && b.getDataStatus() == 1) {
1253 1255 bm.setDataStatus(0);
... ... @@ -1607,6 +1609,9 @@
1607 1609 BabyModel model = models.get(0);
1608 1610 result = getBabyBuildResult(model);
1609 1611 result.setZhlbxqState(model.getZhlbxqState());
  1612 + result.setKouqNew(model.getKouqNew());
  1613 + result.setTxngNew(model.getTxngNew());
  1614 +
1610 1615 BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
1611 1616 List <PatientSerResult> patientSerResults = (List <PatientSerResult>) baseResponse.getObject();
1612 1617 result.setPatientSerResults(patientSerResults);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 88eb0ca
... ... @@ -177,6 +177,8 @@
177 177 List <BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
178 178 for (BabyModel b: babyModels) {//如果出院小结前有多个儿童档案都更新，后就无法控制了
179 179 BabyModel babyModel = setBabyModel(dabm, b);
  180 + babyModel.setTxngNew(dabm.getTxngNew());
  181 + babyModel.setKouqNew(dabm.getKouqNew());
180 182 if(babyModel !=null && StringUtils.isNotBlank(babyModel.getId())){
181 183 babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId());
182 184 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java View file @ 88eb0ca
... ... @@ -81,6 +81,9 @@
81 81 model.setVcCardNo(residentsArchiveModel.getVcCardNo());
82 82 //createDate,hospitalId调用外添加赋值
83 83 }
  84 + model.setDoctorSign(request.getDoctorSign());
  85 + model.setPatientSign(request.getPatientSign());
  86 +
84 87 model.setSsxm(request.getSsxm());
85 88 model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));
86 89 model.setCheckDoctor(request.getCheckDoctor());
... ... @@ -207,6 +210,9 @@
207 210 FamilyPlanningResult familyPlanningResult = new FamilyPlanningResult();
208 211 familyPlanningResult.convertToResult(familyPlanningModel);
209 212  
  213 + familyPlanningResult.setDoctorSign(familyPlanningModel.getDoctorSign());
  214 + familyPlanningResult.setPatientSign(familyPlanningModel.getPatientSign());
  215 +
210 216 if (StringUtils.isNotEmpty(familyPlanningModel.getCheckDoctor())) {
211 217 Users users = usersService.getUsers(NumberUtils.toInt(familyPlanningModel.getCheckDoctor()));
212 218 if (users != null && StringUtils.isNotEmpty(users.getName())) {
... ... @@ -253,6 +259,9 @@
253 259 FamilyPlanningModel familyPlanningModel = familyPlanningService.queryById(id);
254 260 FamilyPlanningResult familyPlanningResult = new FamilyPlanningResult();
255 261 familyPlanningResult.convertToResult(familyPlanningModel);
  262 +
  263 + familyPlanningResult.setDoctorSign(familyPlanningModel.getDoctorSign());
  264 + familyPlanningResult.setPatientSign(familyPlanningModel.getPatientSign());
256 265  
257 266 familyPlanningResult.setCheckDoctor(familyPlanningModel.getCheckDoctor());
258 267 br.setData(familyPlanningResult);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 88eb0ca
... ... @@ -461,7 +461,28 @@
461 461  
462 462 //检查结果 大同
463 463 private String checkResult;
  464 + //医生签名
  465 + private String doctorSign;
464 466  
  467 + //患者签名
  468 + private String patientSign;
  469 +
  470 + public String getDoctorSign() {
  471 + return doctorSign;
  472 + }
  473 +
  474 + public void setDoctorSign(String doctorSign) {
  475 + this.doctorSign = doctorSign;
  476 + }
  477 +
  478 + public String getPatientSign() {
  479 + return patientSign;
  480 + }
  481 +
  482 + public void setPatientSign(String patientSign) {
  483 + this.patientSign = patientSign;
  484 + }
  485 +
465 486 public String getCheckResult() {
466 487 return checkResult;
467 488 }
... ... @@ -2060,6 +2081,8 @@
2060 2081 @Override
2061 2082 public AntExChuModel convertToDataModel() {
2062 2083 AntExChuModel antExChuModel = new AntExChuModel();
  2084 + antExChuModel.setDoctorSign(doctorSign);
  2085 + antExChuModel.setPatientSign(patientSign);
2063 2086  
2064 2087 antExChuModel.setZyzlState(zyzlState);
2065 2088 antExChuModel.setZyzlContent(zyzlContent);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ 88eb0ca
... ... @@ -326,10 +326,15 @@
326 326 private Integer esfs;
327 327 //听性脑干（1通过/2未通过）
328 328 private Integer txng;
  329 + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  330 + private Map<String,Object> txngNew;
329 331 //耳聋基因（1通过/2未通过）
330 332 private Integer eljy;
331 333 //口腔（1通过/2未通过）
332 334 private Integer kouq;
  335 + //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
  336 + private Map<String,Object> kouqNew;
  337 +
333 338 //是否接种卡介苗
334 339 private Integer isBCG;
335 340 //卡介苗接种日期
... ... @@ -371,6 +376,14 @@
371 376 private String openDisease;
372 377 private String openDiseaseType; //1一个月 12一年
373 378  
  379 + public void setTxngNew(Map <String, Object> txngNew) {
  380 + this.txngNew = txngNew;
  381 + }
  382 +
  383 + public void setKouqNew(Map <String, Object> kouqNew) {
  384 + this.kouqNew = kouqNew;
  385 + }
  386 +
374 387 public String getOpenDiseaseType() {
375 388 return openDiseaseType;
376 389 }
... ... @@ -389,6 +402,14 @@
389 402  
390 403 public String getLiveType() {
391 404 return liveType;
  405 + }
  406 +
  407 + public Map <String, Object> getTxngNew() {
  408 + return txngNew;
  409 + }
  410 +
  411 + public Map <String, Object> getKouqNew() {
  412 + return kouqNew;
392 413 }
393 414  
394 415 public void setLiveType(String liveType) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FamilyPlanningRequest.java View file @ 88eb0ca
... ... @@ -153,7 +153,11 @@
153 153 /*取环术字段*/
154 154 //取出节育器形态：key:state zc正常□ yc异常□（details 1嵌顿/2散开/3断裂/4下移/5残留/ qt 其他____）
155 155 private Map <String, Object> qcjyqxt;
  156 + //医生签名
  157 + private String doctorSign;
156 158  
  159 + //患者签名
  160 + private String patientSign;
157 161 public String getId() {
158 162 return id;
159 163 }
... ... @@ -180,6 +184,22 @@
180 184  
181 185 public String getPid() {
182 186 return pid;
  187 + }
  188 +
  189 + public String getDoctorSign() {
  190 + return doctorSign;
  191 + }
  192 +
  193 + public void setDoctorSign(String doctorSign) {
  194 + this.doctorSign = doctorSign;
  195 + }
  196 +
  197 + public String getPatientSign() {
  198 + return patientSign;
  199 + }
  200 +
  201 + public void setPatientSign(String patientSign) {
  202 + this.patientSign = patientSign;
183 203 }
184 204  
185 205 public void setPid(String pid) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 88eb0ca
... ... @@ -18,7 +18,11 @@
18 18 * Created by Administrator on 2016/6/15 0015.
19 19 */
20 20 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
  21 + //医生签名
  22 + private String doctorSign;
21 23  
  24 + //患者签名
  25 + private String patientSign;
22 26 /**
23 27 * start
24 28 * 遵化需求新增字段
... ... @@ -1498,6 +1502,22 @@
1498 1502  
1499 1503 public Double getWeight() {
1500 1504 return weight;
  1505 + }
  1506 +
  1507 + public String getDoctorSign() {
  1508 + return doctorSign;
  1509 + }
  1510 +
  1511 + public void setDoctorSign(String doctorSign) {
  1512 + this.doctorSign = doctorSign;
  1513 + }
  1514 +
  1515 + public String getPatientSign() {
  1516 + return patientSign;
  1517 + }
  1518 +
  1519 + public void setPatientSign(String patientSign) {
  1520 + this.patientSign = patientSign;
1501 1521 }
1502 1522  
1503 1523 public void setWeight(Double weight) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 88eb0ca
... ... @@ -626,7 +626,27 @@
626 626 private String ndbSelectOtherVal;
627 627  
628 628  
  629 + //医生签名
  630 + private String doctorSign;
629 631  
  632 + //患者签名
  633 + private String patientSign;
  634 +
  635 + public String getDoctorSign() {
  636 + return doctorSign;
  637 + }
  638 +
  639 + public void setDoctorSign(String doctorSign) {
  640 + this.doctorSign = doctorSign;
  641 + }
  642 +
  643 + public String getPatientSign() {
  644 + return patientSign;
  645 + }
  646 +
  647 + public void setPatientSign(String patientSign) {
  648 + this.patientSign = patientSign;
  649 + }
630 650  
631 651 public String getFuweiSelect() {
632 652 return fuweiSelect;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 88eb0ca
... ... @@ -8,6 +8,10 @@
8 8 * Created by lqy on 2016/6/17.
9 9 */
10 10 public class BabyBuildResult {
  11 + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  12 + private Map<String,Object> txngNew;
  13 + //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
  14 + private Map<String,Object> kouqNew;
11 15 // 母亲高危因素
12 16 private List<Map<String, Object>> mHighRiskReason;
13 17 // 儿童高危因素标记
... ... @@ -396,6 +400,22 @@
396 400  
397 401 public List getWeakSonInfo() {
398 402 return weakSonInfo;
  403 + }
  404 +
  405 + public Map <String, Object> getTxngNew() {
  406 + return txngNew;
  407 + }
  408 +
  409 + public void setTxngNew(Map <String, Object> txngNew) {
  410 + this.txngNew = txngNew;
  411 + }
  412 +
  413 + public Map <String, Object> getKouqNew() {
  414 + return kouqNew;
  415 + }
  416 +
  417 + public void setKouqNew(Map <String, Object> kouqNew) {
  418 + this.kouqNew = kouqNew;
399 419 }
400 420  
401 421 public void setWeakSonInfo(List weakSonInfo) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 88eb0ca
... ... @@ -22,6 +22,10 @@
22 22 * Created by lqy on 2016/6/17.
23 23 */
24 24 public class BabyPageResult implements IBasicResultConvert<BabyPageResult,BabyModel> {
  25 + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
  26 + private Map<String,Object> txngNew;
  27 + //修改口腔检查：yesOrNo yes○正常 no○异常：下拉项：cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____
  28 + private Map<String,Object> kouqNew;
25 29  
26 30 // 儿童高危因素标记
27 31 private List<String> babyHighRiskReason;
28 32  
... ... @@ -1203,10 +1207,28 @@
1203 1207 this.sINCard = sINCard;
1204 1208 }
1205 1209  
  1210 + public Map <String, Object> getTxngNew() {
  1211 + return txngNew;
  1212 + }
  1213 +
  1214 + public void setTxngNew(Map <String, Object> txngNew) {
  1215 + this.txngNew = txngNew;
  1216 + }
  1217 +
  1218 + public Map <String, Object> getKouqNew() {
  1219 + return kouqNew;
  1220 + }
  1221 +
  1222 + public void setKouqNew(Map <String, Object> kouqNew) {
  1223 + this.kouqNew = kouqNew;
  1224 + }
  1225 +
1206 1226 @Override
1207 1227 public BabyPageResult convertToResult(BabyModel destModel) {
1208 1228 List<String> list = destModel.getmHighRiskReason();
1209 1229 setZhlbxqState(destModel.getZhlbxqState());
  1230 + setTxngNew(destModel.getTxngNew());
  1231 + setKouqNew(destModel.getKouqNew());
1210 1232  
1211 1233 /*滦平 start */
1212 1234 setEsfs(destModel.getEsfs());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FamilyPlanningResult.java View file @ 88eb0ca
... ... @@ -148,9 +148,30 @@
148 148 //术中用药及特殊情况：
149 149 private String szyyqk;
150 150  
  151 + //医生签名
  152 + private String doctorSign;
  153 +
  154 + //患者签名
  155 + private String patientSign;
151 156 /*取环术字段*/
152 157 //取出节育器形态：key:state zc正常□ yc异常□（details 1嵌顿/2散开/3断裂/4下移/5残留/ qt 其他____）
153 158 private Map <String, Object> qcjyqxt;
  159 +
  160 + public String getDoctorSign() {
  161 + return doctorSign;
  162 + }
  163 +
  164 + public void setDoctorSign(String doctorSign) {
  165 + this.doctorSign = doctorSign;
  166 + }
  167 +
  168 + public String getPatientSign() {
  169 + return patientSign;
  170 + }
  171 +
  172 + public void setPatientSign(String patientSign) {
  173 + this.patientSign = patientSign;
  174 + }
154 175  
155 176 public String getId() {
156 177 return id;