jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0e2320533a2aa5412198afb9795b76c6050cf530

Authored by hujiaqi
2 parents bea40f1730 63992a3017
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/DeathCauseEnums.java View file @ 0e23205
1 1 package com.lyms.platform.common.enums;
2 2  
  3 +import org.apache.commons.lang.StringUtils;
  4 +
3 5 /**
4 6 * 死亡原因
5 7 * <p>
... ... @@ -15,6 +17,18 @@
15 17  
16 18 private String id;
17 19 private String name;
  20 +
  21 + public static String getName(String id){
  22 + if (StringUtils.isNotEmpty(id)){
  23 + for (DeathCauseEnums deathCauseEnums : DeathCauseEnums.values()){
  24 + if (deathCauseEnums.getId().equals(id)){
  25 + return deathCauseEnums.getName();
  26 + }
  27 + }
  28 + }
  29 + return "";
  30 + }
  31 +
18 32  
19 33 public String getId() {
20 34 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 0e23205
... ... @@ -217,9 +217,9 @@
217 217 babyQuery.setYn(YnEnums.YES.getId());
218 218  
219 219 //在区域组的时候不用查询隐藏档案
220   - if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
  220 + /* if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
221 221 babyQuery.setExtEnable(false);
222   - }
  222 + }*/
223 223  
224 224 //查询建档记录 得到pid 通过pid查询所有的儿童建档记录
225 225 List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 0e23205
... ... @@ -627,15 +627,15 @@
627 627 boolean isEnable=og.getbStatus()==1;
628 628  
629 629 //外院的孕妇
630   - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, null,true);
  630 + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, deliverQueryRequest.getPid(),true);
631 631 //外院的产妇
632 632 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3);
633 633  
634 634 //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
635 635 //本院的孕妇
636   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, null,isEnable);
  636 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, deliverQueryRequest.getPid(),isEnable);
637 637 //本院产妇
638   - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, null,isEnable);
  638 + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, deliverQueryRequest.getPid(),isEnable);
639 639 PersonModelQuery personModelQuery = new PersonModelQuery();
640 640 String pid = "";
641 641 if (null != patients1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 0e23205
... ... @@ -260,7 +260,7 @@
260 260 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
261 261 map.put("phone",patients.getPhone());
262 262 //基本信息孕周
263   - map.put("fmWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),new Date()));
  263 + map.put("fmWeek", patients.getPhone());
264 264 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
265 265 map.put("mremark",patients.getMremark());
266 266  
... ... @@ -589,7 +589,7 @@
589 589 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
590 590 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
591 591 map.put("phone",patients.getPhone());
592   - map.put("fmWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), new Date()));
  592 + map.put("fmWeek", patients.getPhone());
593 593 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
594 594 map.put("mremark",patients.getMremark());
595 595  
... ... @@ -703,6 +703,20 @@
703 703 }
704 704  
705 705  
  706 + public static String checkWeek(Patients patients){
  707 +
  708 + if (patients.getDueStatus()!=null && patients.getDueStatus()==1){
  709 + return "终止妊娠";
  710 + }else if (patients.getType()!=null && patients.getType() == 3){
  711 + return "已分娩";
  712 + }else if (patients.getLastMenses()!=null){
  713 + return ResolveUtils.getPregnancyWeek(patients.getLastMenses(), new Date());
  714 + }
  715 + return "";
  716 + }
  717 +
  718 +
  719 +
706 720 /**
707 721 * 分娩查询
708 722 * @param id
... ... @@ -746,7 +760,7 @@
746 760 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
747 761 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
748 762 map.put("phone",patients.getPhone());
749   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  763 + map.put("fmWeek",checkWeek(patients));
750 764 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
751 765 map.put("mremark",patients.getMremark());
752 766  
... ... @@ -757,7 +771,7 @@
757 771 }
758 772  
759 773 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
760   - map.put("riskScore", UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  774 + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
761 775  
762 776 map.put("deliveryDate", data.getDueDate());
763 777 map.put("dueWeek", data.getDueWeek());
... ... @@ -816,6 +830,9 @@
816 830 fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation();
817 831 //胎心率
818 832 heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString();
  833 + //转换为整数
  834 + Integer a = (int)Double.parseDouble(heartRate);
  835 + heartRate = String.valueOf(a);
819 836  
820 837 }
821 838  
... ... @@ -831,6 +848,9 @@
831 848 }
832 849 }
833 850 heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate");
  851 + Integer a = (int)Double.parseDouble(heartRate);
  852 + heartRate = String.valueOf(a);
  853 +
834 854 fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation");
835 855 }
836 856 }
... ... @@ -872,7 +892,11 @@
872 892 }
873 893 }
874 894 map.put("deliveryMode", deliveryMode);//分娩方式
875   - map.put("operationCause", data.getOperationCause()==null ? "--":data.getOperationCause());
  895 + if (deliveryMode.contains("顺产")){
  896 + map.put("operationCause", "");
  897 + }else {
  898 + map.put("operationCause", data.getOperationCause()==null ? "--":data.getOperationCause());
  899 + }
876 900  
877 901 findProcess(data.getProdprocess(), map);//1,2,3产程
878 902 findTotalProcess(data.getTotalprocess(),map);//总产程
... ... @@ -885,7 +909,7 @@
885 909  
886 910 /* 产后生理 */
887 911 map.put("maternalInfo", data.getMaternalInfo()==null?"":CfEnums.getTitle(data.getMaternalInfo()));
888   - map.put("deathCause", data.getDeathCause()==null ? "--" : data.getDeathCause());
  912 + map.put("deathCause", com.lyms.platform.common.utils.StringUtils.isEmpty(data.getDeathCause()) ? "--" : DeathCauseEnums.getName(data.getDeathCause()));
889 913 // 产后血压 收缩压，舒张压
890 914 String ssy = "";
891 915 String szy = "";
... ... @@ -925,7 +949,7 @@
925 949 loseBloodCause = sxCauseEnums.getName();
926 950 }
927 951 }
928   - if (SXCauseEnums.O5.getName().equals(data.getLoseBloodCause()) && StringUtils.isNotEmpty(loseBloodCauseMap.get("other"))) {
  952 + if (SXCauseEnums.O5.getName().equals(loseBloodCause) && StringUtils.isNotEmpty(loseBloodCauseMap.get("other"))) {
929 953 loseBloodCause = loseBloodCauseMap.get("other");
930 954 }
931 955 }
932 956  
... ... @@ -943,10 +967,20 @@
943 967 if (CollectionUtils.isNotEmpty(data.getExtPlacentas())){
944 968 for (MaternalDeliverModel.ExtPlacenta temp : data.getExtPlacentas()){
945 969 Map<String,Object> extMap = new HashMap<>();
946   - extMap.put("tpmcType", TaiShuEnums.getTpNameById(temp.getTpmcType()));
  970 + String tpmcType = "";
  971 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(temp.getTpmcType())){
  972 + for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()){
  973 + if (temp.getTpmcType().equals(tpmcTypeEnums.getId())){
  974 + tpmcType = tpmcTypeEnums.getName();
  975 + break;
  976 + }
  977 + }
  978 + }
  979 + extMap.put("tpmcType", tpmcType);
  980 +
947 981 extMap.put("mcType", FunvCommonUtil.checkMianChuFS(temp.getMcType()));
948 982 String tpSize = "";
949   - tpSize += temp.getTpSize().get("c") + "*" + temp.getTpSize().get("k") + "*" + temp.getTpSize().get("g") + UnitConstants.CM;
  983 + tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM;
950 984 extMap.put("tpSize",tpSize);
951 985 extMap.put("tpWeight",UnitUtils.unitSplice(temp.getTpWeight(),UnitConstants.G));
952 986 extMap.put("umbilicalCordLength",UnitUtils.unitSplice(temp.getUmbilicalCordLength(),UnitConstants.CM));
... ... @@ -984,7 +1018,7 @@
984 1018 for (MaternalDeliverModel.Baby temp : data.getBaby()){
985 1019 Map<String,Object> babyMap = new HashMap<>();
986 1020 babyMap.put("dueTime",temp.getDueTime());
987   - babyMap.put("pregnancyOut",temp.getPregnancyOut()==null?"" : StopPregEnums.getTitle(Integer.parseInt(temp.getPregnancyOut())));
  1021 + babyMap.put("pregnancyOut",temp.getPregnancyOut()==null? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut()));
988 1022 babyMap.put("deformity",temp.getDeformity()==null ? "" : temp.getDeformity() == 1 ? "是" : "否");
989 1023 babyMap.put("babyGender",temp.getBabyGender() == null ? "" : SexEnum.getTextById(
990 1024 Integer.parseInt(temp.getBabyGender())));
991 1025  
... ... @@ -996,11 +1030,16 @@
996 1030 String apgarScorePf10 = "";
997 1031 Map<String, String> m = JsonUtil.getMap(temp.getApgarScore());
998 1032 if (MapUtils.isNotEmpty(map)) {
999   - apgarScorePf1 += m.get("pf1") == null ? "" : (m.get("pf1") + "*");
1000   - apgarScorePf5 += m.get("pf5") == null ? "" : (m.get("pf5") + "*");
  1033 + apgarScorePf1 += m.get("pf1") == null ? "" : m.get("pf1");
  1034 + apgarScorePf5 += m.get("pf5") == null ? "" : m.get("pf5");
1001 1035 apgarScorePf10 += m.get("pf10") == null ? "" : m.get("pf10");
1002 1036 }
1003   - babyMap.put("apgarScore", UnitUtils.unitSplice(apgarScorePf1 + apgarScorePf5 + apgarScorePf10,UnitConstants.FEN));
  1037 + String apgarScore = "";
  1038 +
  1039 + if (StringUtils.isNotEmpty(apgarScorePf1) && StringUtils.isNotEmpty(apgarScorePf5) && StringUtils.isNotEmpty(apgarScorePf10)){
  1040 + apgarScore = apgarScorePf1 + UnitConstants.FEN + " - " + apgarScorePf5 + UnitConstants.FEN + " - " + apgarScorePf10 + UnitConstants.FEN;
  1041 + }
  1042 + babyMap.put("apgarScore", apgarScore);
1004 1043 babyMap.put("asphyxiaM",UnitUtils.unitSplice(temp.getAsphyxiaM(),UnitConstants.FZ));
1005 1044 babyMap.put("contactStartM",UnitUtils.unitSplice(temp.getContactStartM(),UnitConstants.FZ));
1006 1045 babyMap.put("contactM",UnitUtils.unitSplice(temp.getContactM(),UnitConstants.FZ));
... ... @@ -1025,7 +1064,7 @@
1025 1064  
1026 1065 Map<String, String> totalprocessMap = JsonUtil.getMap(totalProcess);
1027 1066 if (MapUtils.isNotEmpty(totalprocessMap)) {
1028   - p = totalprocessMap.get("h") + "时," + totalprocessMap.get("m") + "分";
  1067 + p = totalprocessMap.get("h") + "时" + totalprocessMap.get("m") + "分";
1029 1068 }
1030 1069 map.put("totalProcess",p);
1031 1070 return map;
1032 1071  
... ... @@ -1046,11 +1085,11 @@
1046 1085 }
1047 1086 Map<String, String> prodprocessTwo = prodprocessMap.get("two");
1048 1087 if (MapUtils.isNotEmpty(prodprocessTwo)) {
1049   - two = prodprocessOne.get("h") + "时" + prodprocessTwo.get("m") + "分";
  1088 + two = prodprocessTwo.get("h") + "时" + prodprocessTwo.get("m") + "分";
1050 1089 }
1051 1090 Map<String, String> prodprocessThree = prodprocessMap.get("three");
1052 1091 if (MapUtils.isNotEmpty(prodprocessThree)) {
1053   - three = prodprocessOne.get("h") + "时" + prodprocessThree.get("m") + "分";
  1092 + three = prodprocessThree.get("h") + "时" + prodprocessThree.get("m") + "分";
1054 1093 }
1055 1094 }
1056 1095 map.put("one",one);
... ... @@ -1099,7 +1138,7 @@
1099 1138 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
1100 1139 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
1101 1140 map.put("phone",patients.getPhone());
1102   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  1141 + map.put("fmWeek",checkWeek(patients));
1103 1142 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1104 1143 map.put("mremark",patients.getMremark());
1105 1144 //高危因素
... ... @@ -1109,7 +1148,7 @@
1109 1148 }
1110 1149  
1111 1150 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
1112   - map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  1151 + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
1113 1152 /* 复查信息 */
1114 1153 map.put("checkTime",DateUtil.getyyyy_MM_dd(data.getCheckTime()));
1115 1154 map.put("day",data.getDay());
... ... @@ -1232,7 +1271,7 @@
1232 1271 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
1233 1272 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
1234 1273 map.put("phone",patients.getPhone());
1235   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  1274 + map.put("fmWeek",checkWeek(patients));
1236 1275 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1237 1276 map.put("mremark",patients.getMremark());
1238 1277 //高危因素
1239 1278  
... ... @@ -1241,9 +1280,15 @@
1241 1280 highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(),true,basicConfigService);
1242 1281 }
1243 1282 map.put("riskFactor",ResolveUtils.queryHighRisk(highScoreResult));
1244   - map.put("riskScore",UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  1283 + map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN));
  1284 +
1245 1285 map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(data.getLeaveHospitalDate()));
1246   - map.put("afterMakeBabyDays", data.getAfterMakeBabyDays()==null?"":"产后"+data.getAfterMakeBabyDays()+"天");
  1286 +
  1287 + String afterMakeBabyDays = "";
  1288 + if (patients.getFmDate()!=null && data.getLeaveHospitalDate() != null){
  1289 + afterMakeBabyDays = "产后" + DateUtil.daysBetween(patients.getFmDate(), data.getLeaveHospitalDate()) + "天";
  1290 + }
  1291 + map.put("afterMakeBabyDays", afterMakeBabyDays);
1247 1292 String inputMan = "";
1248 1293 if (StringUtils.isNotEmpty(data.getInputMan()) && FunvCommonUtil.isNumeric(data.getInputMan())){
1249 1294 Users users = usersService.getUsers(Integer.parseInt(data.getInputMan()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverQueryRequest.java View file @ 0e23205
... ... @@ -21,6 +21,16 @@
21 21 */
22 22 @FormParam
23 23 private String vcCardNo;
  24 + @FormParam
  25 + private String pid;
  26 +
  27 + public String getPid() {
  28 + return pid;
  29 + }
  30 +
  31 + public void setPid(String pid) {
  32 + this.pid = pid;
  33 + }
24 34  
25 35 public String getCardNo() {
26 36 return cardNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ 0e23205
... ... @@ -55,7 +55,25 @@
55 55 //type 1 儿童建档 2 自动分娩 3 手动建档删除分娩记录
56 56 private String type;
57 57 private String pid;
  58 + private String cardNo;
  59 + private String vcCardNo;
58 60  
  61 + public String getVcCardNo() {
  62 + return vcCardNo;
  63 + }
  64 +
  65 + public void setVcCardNo(String vcCardNo) {
  66 + this.vcCardNo = vcCardNo;
  67 + }
  68 +
  69 + public String getCardNo() {
  70 + return cardNo;
  71 + }
  72 +
  73 + public void setCardNo(String cardNo) {
  74 + this.cardNo = cardNo;
  75 + }
  76 +
59 77 public String getPid() {
60 78 return pid;
61 79 }
... ... @@ -114,6 +132,8 @@
114 132 }
115 133 } catch (Exception e) {
116 134 }
  135 + setCardNo(patients.getCardNo());
  136 + setVcCardNo(patients.getVcCardNo());
117 137 setPid(patients.getPid());
118 138 if (null != patients.getLastMenses()) {
119 139 setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java View file @ 0e23205
... ... @@ -359,15 +359,20 @@
359 359 }
360 360 }
361 361  
  362 + /**
  363 + * 处理会阴撕裂等级
  364 + * @param s
  365 + * @return
  366 + */
362 367 public static String checkSiLieLevel(Integer s) {
363 368 if (s==null){
364 369 return "";
365 370 }
366   - if (s == 1){
  371 + if (s.equals(1)){
367 372 return ONE;
368   - }else if (s == 2){
  373 + }else if (s.equals(2)){
369 374 return TWO;
370   - }else if (s == 3){
  375 + }else if (s.equals(3)){
371 376 return THREE;
372 377 }else {
373 378 return "";