Commit 42dd37935cc5489d178de00cc1479295740dd7f2

Authored by hujiaqi
1 parent 9078386140

修改时间传入格式

Showing 3 changed files with 51 additions and 63 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 42dd379
... ... @@ -925,12 +925,15 @@
925 925  
926 926 PatientsQuery patientsQuery = new PatientsQuery();
927 927  
928   - patientsQuery.setFmDateStart(DateUtil.parseYMD(childbirthManagerRequest.getStartDate()));
929   - patientsQuery.setFmDateEnd(DateUtil.parseYMD(childbirthManagerRequest.getEndDate()));
  928 + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDate())) {
  929 + patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getDate())[0]);
  930 + patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getDate())[1]);
  931 + }
  932 +
930 933 patientsQuery.setName(childbirthManagerRequest.getUserName());
931 934 patientsQuery.setYn(YnEnums.YES.getId());
932 935 patientsQuery.setType(3);
933   - // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
  936 + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
934 937 patientsQuery.setCardNo(childbirthManagerRequest.getCardNo());
935 938 patientsQuery.setPhone(childbirthManagerRequest.getPhone());
936 939 patientsQuery.setHusbandPhone(childbirthManagerRequest.getHusbandPhone());
937 940  
938 941  
939 942  
... ... @@ -1000,19 +1003,33 @@
1000 1003 String fetalPosition = "";
1001 1004 String heartRate = "";
1002 1005 String fetalPresentation = "";
1003   - try {
1004   - for (MatDeliverAddRequest.Placenta placenta : placentaList) {
  1006 + for (Object obj : placentaList) {
  1007 + if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) {
  1008 + MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj;
1005 1009 for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
1006 1010 if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) {
1007 1011 fetalPosition += fetalPositionEnums.getName() + ",";
  1012 + break;
1008 1013 }
1009 1014 }
1010 1015 heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ",";
1011 1016 fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ",";
1012 1017 }
1013   - } catch (Exception e) {
1014   - // 什么都不干,这么干是为了避开原始数据的问题
  1018 + if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
  1019 + Map<String, String> placenta = JsonUtil.getMap(obj.toString());
  1020 + if (MapUtils.isNotEmpty(placenta)) {
  1021 + for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
  1022 + if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) {
  1023 + fetalPosition += fetalPositionEnums.getName() + ",";
  1024 + break;
  1025 + }
  1026 + }
  1027 + heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ",";
  1028 + fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation") + ",";
  1029 + }
  1030 + }
1015 1031 }
  1032 +
1016 1033 childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1));
1017 1034 childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1));
1018 1035 childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1));
... ... @@ -1058,6 +1075,7 @@
1058 1075 for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) {
1059 1076 if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) {
1060 1077 tpmcType += tpmcTypeEnums.getName() + ",";
  1078 + break;
1061 1079 }
1062 1080 }
1063 1081 tpSize += extPlacenta.getTpSize() == null ? "" : extPlacenta.getTpSize() + ",";
1064 1082  
... ... @@ -1093,11 +1111,13 @@
1093 1111 for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) {
1094 1112 if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) {
1095 1113 pregnancyOut += renShenJieJuEnums.getName() + ",";
  1114 + break;
1096 1115 }
1097 1116 }
1098 1117 for (SexEnum sexEnum : SexEnum.values()) {
1099 1118 if (sexEnum.getId().equals(babyModel.getSex())) {
1100 1119 sex += sexEnum.getText() + ",";
  1120 + break;
1101 1121 }
1102 1122 }
1103 1123 babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ",";
... ... @@ -1152,8 +1172,10 @@
1152 1172 BabyModelQuery babyModelQuery = new BabyModelQuery();
1153 1173 babyModelQuery.setYn(YnEnums.YES.getId());
1154 1174 babyModelQuery.setQueryNo(newBabyManagerRequest.getQueryNo());
1155   - babyModelQuery.setBirthStart(DateUtil.parseYMD(newBabyManagerRequest.getBirthStartDate()));
1156   - babyModelQuery.setBirthEnd(DateUtil.parseYMD(newBabyManagerRequest.getBirthEndDate()));
  1175 + if (StringUtils.isNotEmpty(newBabyManagerRequest.getDate())) {
  1176 + babyModelQuery.setBirthStart(DateUtil.getSNDate(newBabyManagerRequest.getDate())[0]);
  1177 + babyModelQuery.setBirthEnd(DateUtil.getSNDate(newBabyManagerRequest.getDate())[1]);
  1178 + }
1157 1179 babyModelQuery.setDueType(newBabyManagerRequest.getDueType());
1158 1180 babyModelQuery.setPage(newBabyManagerRequest.getPage());
1159 1181 babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
... ... @@ -1184,6 +1206,7 @@
1184 1206 for (SexEnum sexEnum : SexEnum.values()) {
1185 1207 if (sexEnum.getId().equals(babyModel.getSex())) {
1186 1208 newBabyManagerQueryModel.setSex(sexEnum.getText());
  1209 + break;
1187 1210 }
1188 1211 }
1189 1212 Integer highRisk = babyModel.getHighRisk();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 42dd379
... ... @@ -28,10 +28,13 @@
28 28 */
29 29 private String phone;
30 30  
31   - private String startDate;
  31 + /**
  32 + * @auther HuJiaqi
  33 + * @createTime 2016年12月13日 17时13分
  34 + * @discription 分娩日期
  35 + */
  36 + private String date;
32 37  
33   - private String endDate;
34   -
35 38 /**
36 39 * @auther HuJiaqi
37 40 * @createTime 2016年12月07日 14时14分
38 41  
... ... @@ -74,20 +77,12 @@
74 77 this.phone = phone;
75 78 }
76 79  
77   - public String getStartDate() {
78   - return startDate;
  80 + public String getDate() {
  81 + return date;
79 82 }
80 83  
81   - public void setStartDate(String startDate) {
82   - this.startDate = startDate;
83   - }
84   -
85   - public String getEndDate() {
86   - return endDate;
87   - }
88   -
89   - public void setEndDate(String endDate) {
90   - this.endDate = endDate;
  84 + public void setDate(String date) {
  85 + this.date = date;
91 86 }
92 87  
93 88 public String getDeliveryMode() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java View file @ 42dd379
... ... @@ -9,42 +9,20 @@
9 9  
10 10 /**
11 11 * @auther HuJiaqi
12   - * @createTime 2016年12月08日 09时56分
13   - * @discription 母亲姓名
  12 + * @createTime 2016年12月13日 16时54分
  13 + * @discription 查询号
14 14 */
15   - // private String mname;
16   -
17   - /**
18   - * @auther HuJiaqi
19   - * @createTime 2016年12月08日 09时56分
20   - * @discription 母亲证件号
21   - */
22   - // private String mcertNo;
23   -
24   - /**
25   - * @auther HuJiaqi
26   - * @createTime 2016年12月08日 09时57分
27   - * @discription 母亲联系方式
28   - */
29   - // private String mphone;
30 15 private String queryNo;
31 16  
32 17 /**
33 18 * @auther HuJiaqi
34   - * @createTime 2016年12月08日 09时57分
35   - * @discription 分娩日期开始
  19 + * @createTime 2016年12月13日 16时54分
  20 + * @discription 分娩日期
36 21 */
37   - private String birthStartDate;
  22 + private String date;
38 23  
39 24 /**
40 25 * @auther HuJiaqi
41   - * @createTime 2016年12月08日 09时57分
42   - * @discription 分娩日期结束
43   - */
44   - private String birthEndDate;
45   -
46   - /**
47   - * @auther HuJiaqi
48 26 * @createTime 2016年12月08日 09时58分
49 27 * @discription 分娩方式
50 28 */
51 29  
... ... @@ -62,20 +40,12 @@
62 40 this.queryNo = queryNo;
63 41 }
64 42  
65   - public String getBirthStartDate() {
66   - return birthStartDate;
  43 + public String getDate() {
  44 + return date;
67 45 }
68 46  
69   - public void setBirthStartDate(String birthStartDate) {
70   - this.birthStartDate = birthStartDate;
71   - }
72   -
73   - public String getBirthEndDate() {
74   - return birthEndDate;
75   - }
76   -
77   - public void setBirthEndDate(String birthEndDate) {
78   - this.birthEndDate = birthEndDate;
  47 + public void setDate(String date) {
  48 + this.date = date;
79 49 }
80 50  
81 51 public String getDueType() {