fangcheng / regional-platform

Download as
Browse Code »

Commit 53276a6294962de468afe810b17a4f15951af81d

Authored by baohanddd
2 parents f9e8d3dbf5 dbcbbe2ecc
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 22 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 53276a6
... ... @@ -213,7 +213,8 @@
213 213 sieveModel.setPhone(patients.getPhone());
214 214 sieveModel.setName(patients.getUsername());
215 215 sieveModel.setLastMenses(patients.getLastMenses());
216   - sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
  216 + sieveModel.setCardNo(patients.getCardNo());
  217 + sieveModel.setDueWeek(days);
217 218 sieveDao.updateChanQianSieve(sieveModel);
218 219 }
219 220 }
... ... @@ -244,6 +245,7 @@
244 245 sieveModel.setHospitalId(patients.getHospitalId());
245 246 sieveModel.setName(patients.getUsername());
246 247 sieveModel.setPhone(patients.getPhone());
  248 + sieveModel.setCardNo(patients.getCardNo());
247 249 sieveModel.setStatus(SieveStatusEnums.O.getId());
248 250 sieveModel.setCqStatus(0);
249 251 sieveModel.setYn(YnEnums.YES.getId());
platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJu1Enums.java View file @ 53276a6
... ... @@ -4,21 +4,21 @@
4 4 * Created by Administrator on 2016/6/24 0024.
5 5 */
6 6 public enum RenShenJieJu1Enums {
7   - O("继续妊娠", 0),O1("终止妊娠", 1);
  7 + O("继续妊娠", "0"),O1("终止妊娠", "1");
8 8  
9   - private RenShenJieJu1Enums(String name, Integer id) {
  9 + private RenShenJieJu1Enums(String name, String id) {
10 10 this.name = name;
11 11 this.id = id;
12 12 }
13 13  
14 14 private String name;
15   - private Integer id;
  15 + private String id;
16 16  
17   - public Integer getId() {
  17 + public String getId() {
18 18 return id;
19 19 }
20 20  
21   - public void setId(Integer id) {
  21 + public void setId(String id) {
22 22 this.id = id;
23 23 }
24 24  
25 25  
... ... @@ -29,9 +29,9 @@
29 29 public void setName(String name) {
30 30 this.name = name;
31 31 }
32   - public static String getTitle(Integer id){
  32 + public static String getTitle(String id){
33 33 for(RenShenJieJu1Enums enums:values()){
34   - if(id==enums.getId()){
  34 + if(id.equals(enums.getId())){
35 35 return enums.getName();
36 36 }
37 37 }
platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJuEnums.java View file @ 53276a6
... ... @@ -4,21 +4,21 @@
4 4 * Created by Administrator on 2016/6/24 0024.
5 5 */
6 6 public enum RenShenJieJuEnums {
7   - O("活产", 0),O1("死胎", 1),O2("浸软胎", 2),O3("死产", 3);
  7 + O("活产", "0"),O1("死胎", "1"),O2("浸软胎", "2"),O3("死产", "3");
8 8  
9   - private RenShenJieJuEnums(String name, Integer id) {
  9 + private RenShenJieJuEnums(String name, String id) {
10 10 this.name = name;
11 11 this.id = id;
12 12 }
13 13  
14 14 private String name;
15   - private Integer id;
  15 + private String id;
16 16  
17   - public Integer getId() {
  17 + public String getId() {
18 18 return id;
19 19 }
20 20  
21   - public void setId(Integer id) {
  21 + public void setId(String id) {
22 22 this.id = id;
23 23 }
24 24  
25 25  
... ... @@ -29,9 +29,9 @@
29 29 public void setName(String name) {
30 30 this.name = name;
31 31 }
32   - public static String getTitle(Integer id){
  32 + public static String getTitle(String id){
33 33 for(RenShenJieJuEnums enums:values()){
34   - if(id==enums.getId()){
  34 + if(id.equals(enums.getId())){
35 35 return enums.getName();
36 36 }
37 37 }
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java View file @ 53276a6
... ... @@ -28,8 +28,8 @@
28 28 private String phone;
29 29 //生日
30 30 private Date birth;
31   - //申请孕周、申请月龄
32   - private String dueWeek;
  31 + //申请孕周、申请月龄(多少天)
  32 + private Integer dueWeek;
33 33  
34 34 //身份证号
35 35 private String cardNo;
36 36  
... ... @@ -106,11 +106,11 @@
106 106 this.expVip = expVip;
107 107 }
108 108  
109   - public String getDueWeek() {
  109 + public Integer getDueWeek() {
110 110 return dueWeek;
111 111 }
112 112  
113   - public void setDueWeek(String dueWeek) {
  113 + public void setDueWeek(Integer dueWeek) {
114 114 this.dueWeek = dueWeek;
115 115 }
116 116  
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java View file @ 53276a6
... ... @@ -26,10 +26,12 @@
26 26 private Integer tireNumber;
27 27 //整体风险
28 28 private Integer ztfx;
  29 + private String cardNo;
  30 +
29 31 //联系方式
30 32 private String phone;
31   - //申请孕周
32   - private String dueWeek;
  33 + //申请孕周(怀孕的天数)
  34 + private Integer dueWeek;
33 35 //产前诊断 1 已检查 0 未检查
34 36 private Integer cqStatus;
35 37 //产前诊断结果
... ... @@ -52,6 +54,15 @@
52 54 private Date modified;
53 55 private Integer yn;
54 56  
  57 +
  58 + public String getCardNo() {
  59 + return cardNo;
  60 + }
  61 +
  62 + public void setCardNo(String cardNo) {
  63 + this.cardNo = cardNo;
  64 + }
  65 +
55 66 public String getFrom() {
56 67 return from;
57 68 }
58 69  
... ... @@ -132,11 +143,11 @@
132 143 this.diaUnit = diaUnit;
133 144 }
134 145  
135   - public String getDueWeek() {
  146 + public Integer getDueWeek() {
136 147 return dueWeek;
137 148 }
138 149  
139   - public void setDueWeek(String dueWeek) {
  150 + public void setDueWeek(Integer dueWeek) {
140 151 this.dueWeek = dueWeek;
141 152 }
142 153  
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java View file @ 53276a6
... ... @@ -41,9 +41,9 @@
41 41 //年龄
42 42 private String age;
43 43 //孕周
44   - private String dueDateStart;
  44 + private Integer dueDateStart;
45 45 //孕周
46   - private Date dueDateEnd;
  46 + private Integer dueDateEnd;
47 47 //风险等级
48 48 private String rLevel;
49 49 private Integer scoreStart;
... ... @@ -79,9 +79,6 @@
79 79 */
80 80 private Date lastMensesEnd;
81 81  
82   - public void setDueDateStart(String dueDateStart) {
83   - this.dueDateStart = dueDateStart;
84   - }
85 82  
86 83 public Integer getScoreEnd() {
87 84 return scoreEnd;
88 85  
89 86  
90 87  
... ... @@ -211,15 +208,22 @@
211 208 this.id = id;
212 209 }
213 210  
214   - public Date getDueDateEnd() {
  211 + public Integer getDueDateEnd() {
215 212 return dueDateEnd;
216 213 }
217 214  
218   - public void setDueDateEnd(Date dueDateEnd) {
  215 + public void setDueDateEnd(Integer dueDateEnd) {
219 216 this.dueDateEnd = dueDateEnd;
220 217 }
221 218  
  219 + public Integer getDueDateStart() {
  220 + return dueDateStart;
  221 + }
222 222  
  223 + public void setDueDateStart(Integer dueDateStart) {
  224 + this.dueDateStart = dueDateStart;
  225 + }
  226 +
223 227 @Override
224 228 public MongoQuery convertToQuery() {
225 229 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -304,6 +308,23 @@
304 308 }
305 309 MongoCondition mongoCondition1=MongoCondition.newInstance("transferredHospital", list, MongoOper.IN);
306 310 condition=condition.andCondition(mongoCondition1);
  311 + }
  312 + if (isAddStart) {
  313 + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
  314 + }
  315 +
  316 +
  317 + if (null != dueDateStart) {
  318 + c = Criteria.where("dueWeek").gte(dueDateStart);
  319 + isAddStart = Boolean.TRUE;
  320 + }
  321 + if (null != dueDateEnd) {
  322 + if (isAddStart) {
  323 + c = c.lte(dueDateEnd);
  324 + } else {
  325 + c = Criteria.where("dueWeek").lte(dueDateEnd);
  326 + }
  327 + isAddStart = Boolean.TRUE;
307 328 }
308 329 if (isAddStart) {
309 330 return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java View file @ 53276a6
... ... @@ -10,9 +10,8 @@
10 10 import java.util.Date;
11 11  
12 12 /**
13   - *
14 13 * 产前筛查
15   - *
  14 + * <p>
16 15 * Created by Administrator on 2016/7/5 0005.
17 16 */
18 17 public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
19 18  
... ... @@ -44,9 +43,9 @@
44 43 private Integer yn;
45 44  
46 45 //孕周开始
47   - private Date dueWeekStart;
  46 + private Integer dueWeekStart;
48 47 //孕周结束
49   - private Date dueWeekEnd;
  48 + private Integer dueWeekEnd;
50 49  
51 50 /**
52 51 * 末次月经
53 52  
54 53  
55 54  
... ... @@ -89,19 +88,19 @@
89 88 this.isNotify = isNotify;
90 89 }
91 90  
92   - public Date getDueWeekEnd() {
  91 + public Integer getDueWeekEnd() {
93 92 return dueWeekEnd;
94 93 }
95 94  
96   - public void setDueWeekEnd(Date dueWeekEnd) {
  95 + public void setDueWeekEnd(Integer dueWeekEnd) {
97 96 this.dueWeekEnd = dueWeekEnd;
98 97 }
99 98  
100   - public Date getDueWeekStart() {
  99 + public Integer getDueWeekStart() {
101 100 return dueWeekStart;
102 101 }
103 102  
104   - public void setDueWeekStart(Date dueWeekStart) {
  103 + public void setDueWeekStart(Integer dueWeekStart) {
105 104 this.dueWeekStart = dueWeekStart;
106 105 }
107 106  
... ... @@ -143,8 +142,8 @@
143 142 if (null != id) {
144 143 condition = condition.and("id", id, MongoOper.IS);
145 144 }
146   - if(null!=from){
147   - condition=condition.and("from",from,MongoOper.IS);
  145 + if (null != from) {
  146 + condition = condition.and("from", from, MongoOper.IS);
148 147 }
149 148 if (null != hospitalId) {
150 149 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
... ... @@ -153,7 +152,7 @@
153 152 condition = condition.and("parentId", parentId, MongoOper.IS);
154 153 }
155 154 if (null != name) {
156   - condition = condition.and("name", name, MongoOper.IS);
  155 + condition = condition.and("name", name, MongoOper.LIKE);
157 156 }
158 157 if (null != tireNumber) {
159 158 condition = condition.and("tireNumber", tireNumber, MongoOper.IS);
160 159  
... ... @@ -177,8 +176,25 @@
177 176 if (null != renShenResult) {
178 177 condition = condition.and("renShenResult", renShenResult, MongoOper.IS);
179 178 }
180   - boolean isAddStart = Boolean.FALSE;
  179 +
181 180 Criteria c = null;
  181 + boolean isAddStart = Boolean.FALSE;
  182 + if (null != dueWeekStart) {
  183 + c = Criteria.where("dueWeek").gte(dueWeekStart);
  184 + isAddStart = Boolean.TRUE;
  185 + }
  186 + if (null != dueWeekEnd) {
  187 + if (isAddStart) {
  188 + c = c.lte(dueWeekEnd);
  189 + } else {
  190 + c = Criteria.where("dueWeek").lte(dueWeekEnd);
  191 + }
  192 + isAddStart = Boolean.TRUE;
  193 + }
  194 +
  195 + if (isAddStart) {
  196 + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
  197 + }
182 198 if (null != lastMensesStart) {
183 199 c = Criteria.where("lastMenses").gte(lastMensesStart);
184 200 isAddStart = Boolean.TRUE;
... ... @@ -258,7 +274,6 @@
258 274 public void setPhone(String phone) {
259 275 this.phone = phone;
260 276 }
261   -
262 277  
263 278  
264 279 public Integer getTireNumber() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 53276a6
... ... @@ -395,7 +395,7 @@
395 395 for (Patients patients : list) {
396 396 HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false);
397 397 antexListResult.setRiskFactor(highScoreResult.getHighRisk());
398   - antexListResult.setRiskScore(highScoreResult.getScore() + "");
  398 + antexListResult.setRiskScore(highScoreResult.getScoreStr());
399 399  
400 400 List<AntData> data = new ArrayList<>();
401 401 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
... ... @@ -650,7 +650,7 @@
650 650 antexListResult.setData(handlAntData(antExChulist, list));
651 651 antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));
652 652 antexListResult.setRiskFactor(highScoreResult.getHighRisk());
653   - antexListResult.setRiskScore(highScoreResult.getScore() + "");
  653 + antexListResult.setRiskScore(highScoreResult.getScoreStr());
654 654 int days = DateUtil.getDays(patients.getLastMenses(), new Date());
655 655 // 28孕周（28+1—28+6）
656 656 if ((days >= 197) && days <= 202) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 53276a6
... ... @@ -118,7 +118,7 @@
118 118 referralApplyOrderModel.setScore(highScoreResult.getScore());
119 119 referralApplyOrderModel.setrLevel(highScoreResult.getLevelId());
120 120 referralApplyOrderModel.setPid(patients.getPid());
121   - referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
  121 + referralApplyOrderModel.setDueWeek(days);
122 122 if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
123 123  
124 124 PatientsQuery patientsQuery1 = new PatientsQuery();
125 125  
... ... @@ -141,8 +141,8 @@
141 141 if (null != babyModel) {
142 142 if (null != babyModel.getBirth()) {
143 143 referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth()));
  144 + referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date()));
144 145 }
145   - referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())));
146 146 Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
147 147 referralApplyOrderModel.setParentId(babyModel.getId());
148 148 referralApplyOrderModel.setMname(patients.getUsername());
... ... @@ -246,7 +246,7 @@
246 246 SieveModel sieveModel = sieveModels.get(0);
247 247 sieveModel.setStatus(2);
248 248 int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
249   - sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
  249 + sieveModel.setDueWeek(days);
250 250 sieveService.updateOneChanQianDiaSieve(sieveModel);
251 251 }
252 252 }
... ... @@ -345,6 +345,17 @@
345 345 referralApplyOrderQuery.setExpVip(1);
346 346 }
347 347  
  348 +
  349 + /* if(null!=applyOrderQueryRequest.getStartScore()){
  350 + referralApplyOrderQuery.setScoreStart(applyOrderQueryRequest.getStartScore());
  351 + }
  352 +
  353 + if(null!=applyOrderQueryRequest.getEndScore()){
  354 + referralApplyOrderQuery.setScoreEnd(applyOrderQueryRequest.getEndScore());
  355 + }*/
  356 +
  357 +
  358 +
348 359 List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
349 360 if (CollectionUtils.isNotEmpty(orderModels)) {
350 361 String zhuanCName = "";
351 362  
... ... @@ -405,11 +416,13 @@
405 416 referralApplyOrderQuery.setBirthEnd(date);
406 417 }
407 418 //根据孕周
408   - if(null!=applyOrderQueryRequest.getEndDueWeek()){
409   -
  419 + if(null!=applyOrderQueryRequest.getEndDueWeek() &&NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())){
  420 + int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())*7;
  421 + referralApplyOrderQuery.setDueDateEnd(i);
410 422 }
411 423 if(null!=applyOrderQueryRequest.getStartDueWeek()){
412   -
  424 + int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek())*7;
  425 + referralApplyOrderQuery.setDueDateStart(i);
413 426 }
414 427  
415 428 if(null!=applyOrderQueryRequest.getStartScore()){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 53276a6
... ... @@ -126,16 +126,22 @@
126 126  
127 127 list.add(checkRecord);
128 128 }
  129 +
  130 + Collections.reverse(list);
129 131 }
130 132 //查询儿童的基本信息
131 133 BabyModel model = babyCheckFacade.getBabyModel(babyId, base);
132 134  
  135 +
  136 + List<Map<String, String>> tempList = new ArrayList<>();
133 137 if(CollectionUtils.isNotEmpty(models)){
134 138 for(BabyModel babyModel:models){
135   - babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, list);
  139 + babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, tempList);
136 140 }
137 141 }
138 142  
  143 + list.addAll(tempList);
  144 +
139 145 resMap.put("baseInfo", base);
140 146 resMap.put("checkList", list);
141 147 br.setData(resMap);
... ... @@ -248,6 +254,22 @@
248 254 }
249 255 }
250 256  
  257 + //判断就诊卡号是否已经建档
  258 + if (StringUtils.isNotEmpty(request.getVcCardNo()) )
  259 + {
  260 + BabyModelQuery babyQuery = new BabyModelQuery();
  261 + babyQuery.setYn(YnEnums.YES.getId());
  262 + babyQuery.setVcCardNo(request.getVcCardNo());
  263 + babyQuery.setHospitalId(request.getHospitalId());
  264 + List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  265 + if (CollectionUtils.isNotEmpty(models))
  266 + {
  267 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  268 + br.setErrormsg("儿童就诊卡号在该医院已经建档");
  269 + return br;
  270 + }
  271 + }
  272 +
251 273 Patients patients = null;
252 274 PersonModel resperson = null;
253 275 String babyPersonId = "";
... ... @@ -1299,7 +1321,7 @@
1299 1321 }
1300 1322 }
1301 1323 }
1302   - result.setDiagnose(diagnose);
  1324 + result.setDiagnose(StringUtils.emptyDeal(diagnose));
1303 1325 list.add(result);
1304 1326 }
1305 1327 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 53276a6
... ... @@ -266,9 +266,12 @@
266 266 }
267 267 list.add(checkRecord);
268 268 }
  269 +
  270 + Collections.reverse(list);
269 271 }
270 272 }
271 273 }
  274 +
272 275  
273 276 public BabyModel getBabyModel(String id, BabyBasicResult base) {
274 277 BabyModel model=null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 53276a6
... ... @@ -113,6 +113,20 @@
113 113 }
114 114 }
115 115  
  116 + //就诊卡号判断
  117 + if (StringUtils.isNotEmpty(yunRequest.getVcCardNo()))
  118 + {
  119 + patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
  120 + patientsQuery.setHospitalId(yunRequest.getHospitalId());
  121 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  122 + if (CollectionUtils.isNotEmpty(patients))
  123 + {
  124 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  125 + br.setErrormsg("该就诊卡号在该医院已经建档");
  126 + return br;
  127 + }
  128 + }
  129 +
116 130 Integer type = 1; //1孕妇 2儿童 3产妇
117 131 Date date = null;
118 132 if (yunRequest.getLastMenstrualPeriod() != null)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 53276a6
... ... @@ -485,7 +485,7 @@
485 485 }
486 486  
487 487 matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk());
488   - matDeliverListResult.setRiskScore(highScoreResult.getScore() + "");
  488 + matDeliverListResult.setRiskScore(highScoreResult.getScoreStr());
489 489 matDeliverListResult.setTireNumber1(tTireNumber);
490 490 } catch (Exception e) {
491 491 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 53276a6
... ... @@ -249,7 +249,7 @@
249 249 try {
250 250 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),false);
251 251 patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
252   - patientBaseResult.setRiskScore(highScoreResult.getScore() + "");
  252 + patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
253 253 } catch (Exception e) {
254 254 }
255 255 return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 53276a6
... ... @@ -161,7 +161,7 @@
161 161 postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate);
162 162 postReviewListResult.setData(dataList);
163 163 postReviewListResult.setRiskFactor(highScoreResult.getHighRisk());
164   - postReviewListResult.setRiskScore(highScoreResult.getScore()+"");
  164 + postReviewListResult.setRiskScore(highScoreResult.getScoreStr());
165 165 }
166 166 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult);
167 167 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 53276a6
... ... @@ -28,6 +28,7 @@
28 28 import org.springframework.stereotype.Component;
29 29  
30 30 import java.util.ArrayList;
  31 +import java.util.Date;
31 32 import java.util.List;
32 33  
33 34 /**
... ... @@ -135,8 +136,12 @@
135 136 sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult());
136 137 sieveQuery.setName(cqSieveQueryRequest.getName());
137 138 sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo());
138   - sieveQuery.setDueWeekStart(DateUtil.parseYMD(cqSieveQueryRequest.getDueWeekStart()));
139   - sieveQuery.setDueWeekEnd(DateUtil.parseYMD(cqSieveQueryRequest.getDueWeekEnd()));
  139 + if(null!=cqSieveQueryRequest.getDueWeekStart()){
  140 + sieveQuery.setDueWeekStart(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekStart()));
  141 + }
  142 + if(null!=cqSieveQueryRequest.getDueWeekEnd()){
  143 + sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()));
  144 + }
140 145 sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx());
141 146 sieveQuery.setIsNotify(cqSieveQueryRequest.getIsNotify());
142 147 sieveQuery.setPage(cqSieveQueryRequest.getPage());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java View file @ 53276a6
... ... @@ -310,7 +310,9 @@
310 310 this.cDueWeek= StringUtils.dueWeek(days);
311 311 }
312 312 setPid(destModel.getPid());
313   - setDueWeek(destModel.getDueWeek());
  313 + if(null!=destModel.getDueWeek()){
  314 + setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
  315 + }
314 316 setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
315 317 setApplyDoctor(destModel.getApplyDoctor());
316 318 setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java View file @ 53276a6
... ... @@ -14,7 +14,7 @@
14 14 * Created by Administrator on 2016/7/14 0014.
15 15 */
16 16 public class BabyApplyOrderResult {
17   - public static final String SPIT="-";
  17 + public static final String SPIT = "-";
18 18 private String id;
19 19 private String pid;
20 20 //名字
... ... @@ -103,7 +103,7 @@
103 103 this.babyId = babyId;
104 104 }
105 105  
106   - public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName,String zhuanRname) {
  106 + public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName, String zhuanRname) {
107 107 setPid(referralApplyOrderModel.getPid());
108 108 setZhuanRname(zhuanRname);
109 109 setZhuanCName(zhuanCName);
110 110  
... ... @@ -117,11 +117,13 @@
117 117 if (null != referralApplyOrderModel.getReceived()) {
118 118 setReceived(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getReceived()));
119 119 }
120   - if(null!=referralApplyOrderModel.getBirth()){
  120 + if (null != referralApplyOrderModel.getBirth()) {
121 121 setBirth(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getBirth()));
122 122 setCyl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date())));
123 123 }
124   - setYl(referralApplyOrderModel.getDueWeek());
  124 + if (null != referralApplyOrderModel.getBirth()) {
  125 + setYl(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), referralApplyOrderModel.getCreated())));
  126 + }
125 127 if (null != referralApplyOrderModel.getCreated()) {
126 128 setCreated(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getCreated()));
127 129 }
... ... @@ -134,7 +136,7 @@
134 136  
135 137 public String getApplyDoctor() {
136 138  
137   - if(null==applyDoctor){
  139 + if (null == applyDoctor) {
138 140 return SPIT;
139 141 }
140 142 return applyDoctor;
... ... @@ -145,7 +147,7 @@
145 147 }
146 148  
147 149 public String getBirth() {
148   - if(null==birth){
  150 + if (null == birth) {
149 151 return SPIT;
150 152 }
151 153  
... ... @@ -158,7 +160,7 @@
158 160  
159 161 public String getCreated() {
160 162  
161   - if(null==created){
  163 + if (null == created) {
162 164 return SPIT;
163 165 }
164 166 return created;
... ... @@ -169,7 +171,7 @@
169 171 }
170 172  
171 173 public String gethRisk() {
172   - if(null==hRisk){
  174 + if (null == hRisk) {
173 175 return SPIT;
174 176 }
175 177  
... ... @@ -190,7 +192,7 @@
190 192  
191 193 public String getmName() {
192 194  
193   - if(null==mName){
  195 + if (null == mName) {
194 196 return SPIT;
195 197 }
196 198 return mName;
... ... @@ -201,7 +203,7 @@
201 203 }
202 204  
203 205 public String getName() {
204   - if(null==name){
  206 + if (null == name) {
205 207 return SPIT;
206 208 }
207 209  
... ... @@ -214,7 +216,7 @@
214 216  
215 217 public String getPhone() {
216 218  
217   - if(null==phone){
  219 + if (null == phone) {
218 220 return SPIT;
219 221 }
220 222 return phone;
... ... @@ -225,7 +227,7 @@
225 227 }
226 228  
227 229 public String getPotentialRisk() {
228   - if(null==potentialRisk){
  230 + if (null == potentialRisk) {
229 231 return SPIT;
230 232 }
231 233  
... ... @@ -238,7 +240,7 @@
238 240  
239 241 public String getReceived() {
240 242  
241   - if(null==received){
  243 + if (null == received) {
242 244 return SPIT;
243 245 }
244 246 return received;
... ... @@ -250,7 +252,7 @@
250 252  
251 253 public String getSex() {
252 254  
253   - if(null==sex){
  255 + if (null == sex) {
254 256 return SPIT;
255 257 }
256 258 return sex;
... ... @@ -261,7 +263,7 @@
261 263 }
262 264  
263 265 public String getTransferredDisease() {
264   - if(null==transferredDisease){
  266 + if (null == transferredDisease) {
265 267 return SPIT;
266 268 }
267 269  
... ... @@ -272,9 +274,8 @@
272 274 this.transferredDisease = transferredDisease;
273 275 }
274 276  
275   - public String getTransferredHospital()
276   - {
277   - if(null==transferredHospital){
  277 + public String getTransferredHospital() {
  278 + if (null == transferredHospital) {
278 279 return SPIT;
279 280 }
280 281 return transferredHospital;
... ... @@ -284,9 +285,8 @@
284 285 this.transferredHospital = transferredHospital;
285 286 }
286 287  
287   - public String getYl()
288   - {
289   - if(null==yl){
  288 + public String getYl() {
  289 + if (null == yl) {
290 290 return SPIT;
291 291 }
292 292 return yl;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java View file @ 53276a6
... ... @@ -41,6 +41,14 @@
41 41 return score;
42 42 }
43 43  
  44 +
  45 + public String getScoreStr(){
  46 + if(null==score){
  47 + return "";
  48 + }
  49 + return score+"";
  50 + }
  51 +
44 52 public List<String> getLevelId() {
45 53 if (null == level) {
46 54 return Collections.emptyList();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ 53276a6
... ... @@ -181,19 +181,31 @@
181 181 //早吮吸
182 182 private String earlySuck;
183 183  
  184 + //分娩时间
  185 + private String dueTime;
  186 +
184 187 public Baby(MaternalDeliverModel.Baby babyModel){
185 188 setId(babyModel.getId());
186   - setBabyGender(babyModel.getBabyGender()+"");
  189 + setBabyGender(babyModel.getBabyGender() + "");
187 190 setBabyWeight(babyModel.getBabyWeight());
188 191 setBabyHeight(babyModel.getBabyHeight());
189 192 setDeformity(babyModel.getDeformity());
190   - setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(),Map.class));
  193 + setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class));
191 194 setAsphyxiaM(babyModel.getAsphyxiaM());
192 195 setPregnancyOut(babyModel.getPregnancyOut());
193 196 setBabyHealthy(babyModel.getBabyHealthy());
194 197 setContactStartM(babyModel.getContactStartM());
195 198 setContactM(babyModel.getContactM());
196 199 setEarlySuck(babyModel.getEarlySuck());
  200 + setDueTime(babyModel.getDueTime());
  201 + }
  202 +
  203 + public String getDueTime() {
  204 + return dueTime;
  205 + }
  206 +
  207 + public void setDueTime(String dueTime) {
  208 + this.dueTime = dueTime;
197 209 }
198 210  
199 211 public String getId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java View file @ 53276a6
... ... @@ -250,7 +250,7 @@
250 250 }
251 251 setPregnancyOutcome(sieveModel.getRenShenResult());
252 252 if(null!=sieveModel.getRenShenResult()){
253   - setPregnancyOutcomeText(RenShenJieJuEnums.getTitle(sieveModel.getRenShenResult()));
  253 + setPregnancyOutcomeText(RenShenJieJuEnums.getTitle(sieveModel.getRenShenResult()+""));
254 254 }
255 255 setStatus(sieveModel.getStatus());
256 256 setDiaTime(sieveModel.getDiaTime());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ 53276a6
... ... @@ -179,7 +179,9 @@
179 179 if(null!=destModel.getTireNumber()){
180 180 setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + ""));
181 181 }
182   - setDueWeek(destModel.getDueWeek());
  182 + if(null!=destModel.getDueWeek()){
  183 + setDueWeek(StringUtils.dueWeek(destModel.getDueWeek()));
  184 + }
183 185 if(null!=destModel.getZtfx()) {
184 186 setZtfx(destModel.getZtfx()+"");
185 187 setZtfxText(SieveEnums.getTitle(destModel.getZtfx()));
... ... @@ -192,7 +194,7 @@
192 194 setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult()));
193 195 }
194 196 if(null!=destModel.getRenShenResult()) {
195   - setRenShenResult(RenShenJieJu1Enums.getTitle(destModel.getRenShenResult()));
  197 + setRenShenResult(RenShenJieJu1Enums.getTitle(destModel.getRenShenResult()+""));
196 198 }
197 199 setStatus(destModel.getStatus());
198 200 //整体风险枚举