jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ab3ad5c3b56d8bfeb4ccbc8a9d763b750e34e2b7

Authored by yangfei
2 parents 8bf40b798c 9fcb82f5b8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java View file @ ab3ad5c
... ... @@ -924,7 +924,7 @@
924 924 {
925 925  
926 926 SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHH:mm:ss");
927   - SimpleDateFormat fmt2 = new SimpleDateFormat("yyyyMMdd");
  927 + SimpleDateFormat fmt2 = new SimpleDateFormat("yyyy-MM-dd");
928 928 SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
929 929 MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult();
930 930 // Connection conn = ConnTools.makeFmConnection();
... ... @@ -1057,7 +1057,7 @@
1057 1057 // if(baby_Asphyxiam!=null){
1058 1058 // baby.setAsphyxiaM(baby_Asphyxiam); //窒息分钟
1059 1059 // }
1060   -// baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形
  1060 +// //baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形
1061 1061 //
1062 1062 // String baby_Pregnancy_Out = fmItem.getCcqk();
1063 1063 // if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
1064 1064  
... ... @@ -1111,10 +1111,12 @@
1111 1111 fmItem1.setFmfs("剖宫产");
1112 1112 fmItem1.setTpmcfs("自然产出");
1113 1113 fmItem1.setYeqk("正常");
  1114 + fmItem1.setJx("无");
1114 1115  
1115 1116 duoTaiList.add(fmItem1);
1116 1117  
1117 1118 FmItem fmItem2 = new FmItem();
  1119 + fmItem2.setJx("无");
1118 1120 fmItem2.setSyxh("10019988");
1119 1121 fmItem2.setJlrq("2017011217:52:00");
1120 1122 fmItem2.setSsj("2");
... ... @@ -1241,7 +1243,7 @@
1241 1243 if(baby_Asphyxiam!=null){
1242 1244 baby.setAsphyxiaM(baby_Asphyxiam); //窒息分钟
1243 1245 }
1244   - baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形
  1246 + //baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形
1245 1247  
1246 1248 String baby_Pregnancy_Out = fmItem.getCcqk();
1247 1249 if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ ab3ad5c
... ... @@ -11,8 +11,10 @@
11 11 import com.lyms.platform.common.annotation.TokenRequired;
12 12 import com.lyms.platform.common.base.BaseController;
13 13 import com.lyms.platform.common.base.LoginContext;
  14 +import com.lyms.platform.common.constants.ErrorCodeConstants;
14 15 import com.lyms.platform.common.enums.SieveStatusEnums;
15 16 import com.lyms.platform.common.enums.YnEnums;
  17 +import com.lyms.platform.common.result.BaseObjectResponse;
16 18 import com.lyms.platform.common.result.BaseResponse;
17 19 import com.lyms.platform.common.utils.CompressEncodeingUtil;
18 20 import com.lyms.platform.common.utils.DateUtil;
... ... @@ -1687,9 +1689,8 @@
1687 1689  
1688 1690 @RequestMapping("/qhdfm")
1689 1691 @ResponseBody
1690   - public MaternalDeliverResult qhdfm(String cardNo){
1691   -
1692   - return qhdfyFmService.queryFmPatient(cardNo);
  1692 + public BaseObjectResponse qhdfm(String cardNo){
  1693 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(qhdfyFmService.queryFmPatient(cardNo));
1693 1694 }
1694 1695  
1695 1696  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ ab3ad5c
... ... @@ -124,7 +124,7 @@
124 124 setDeliveryMode(JsonUtil.jkstr2Obj(destModel.getDeliveryMode(), Map.class));
125 125 setOperationCause(destModel.getOperationCause());
126 126  
127   - setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(), Map.class));
  127 + setProdprocess(destModel.getProdprocess() == null ? null : JsonUtil.jkstr2Obj(destModel.getProdprocess(), Map.class));
128 128 setTotalprocess(JsonUtil.jkstr2Obj(destModel.getTotalprocess(), Map.class));
129 129 setPerinealCondition(destModel.getPerinealCondition());
130 130 setSiLielevel(destModel.getSiLielevel());