shiyang / regional-platform

Download as
Browse Code »

Commit 71596c97b681e6e98b85cd13e1aaa7820d2802b7

Authored by jiangjiazhi
2 parents 8de841ceb6 58fecec38b
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 15 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ 71596c9
... ... @@ -162,11 +162,11 @@
162 162 keyName = ite.next();
163 163 if (i > 0)
164 164 { // 类容数据
165   - keyORvalue = map.get(keyName).toString();
  165 + keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
166 166 }
167 167 else
168 168 { // 第一行列名
169   - keyORvalue = map.get(keyName).toString();
  169 + keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
170 170 keyName = columName.get(keyName);
171 171 ws.addCell(new Label(j, 0, keyName, wcf));
172 172 }
platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ 71596c9
... ... @@ -26,7 +26,7 @@
26 26 //性别
27 27 private String sex;
28 28 //出生日期
29   - private String brithDay;
  29 + private String birthday;
30 30 //国籍
31 31 private String countryId;
32 32 //民族Id
33 33  
... ... @@ -134,12 +134,12 @@
134 134 this.sex = sex;
135 135 }
136 136  
137   - public String getBrithDay() {
138   - return brithDay;
  137 + public String getBirthday() {
  138 + return birthday;
139 139 }
140 140  
141   - public void setBrithDay(String brithDay) {
142   - this.brithDay = brithDay;
  141 + public void setBirthday(String birthday) {
  142 + this.birthday = birthday;
143 143 }
144 144  
145 145 public String getCountryId() {
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 71596c9
... ... @@ -301,12 +301,14 @@
301 301 * 1:孕妇,2:儿童
302 302 */
303 303 private Integer type = -1;
  304 + private List<Integer> typeList;
304 305  
305 306 private String hospitalId;
306 307  
307 308 private String hcertificateNum;
308 309  
309 310 private Integer buildType = -1;
  311 + private Integer buildTypeNot = -1;
310 312  
311 313 private List<Integer> buildTypeList;
312 314  
313 315  
... ... @@ -435,7 +437,14 @@
435 437 this.buildType = buildType;
436 438 }
437 439  
  440 + public Integer getBuildTypeNot() {
  441 + return buildTypeNot;
  442 + }
438 443  
  444 + public void setBuildTypeNot(Integer buildTypeNot) {
  445 + this.buildTypeNot = buildTypeNot;
  446 + }
  447 +
439 448 public Integer getBuildTypeEq() {
440 449 return buildTypeEq;
441 450 }
... ... @@ -540,6 +549,14 @@
540 549 this.type = type;
541 550 }
542 551  
  552 + public List<Integer> getTypeList() {
  553 + return typeList;
  554 + }
  555 +
  556 + public void setTypeList(List<Integer> typeList) {
  557 + this.typeList = typeList;
  558 + }
  559 +
543 560 public String getCardNo() {
544 561 return cardNo;
545 562 }
546 563  
... ... @@ -727,7 +744,11 @@
727 744 condition = condition.and("buildType", buildTypeEq, MongoOper.IS);
728 745 }
729 746  
  747 + if(buildTypeNot!=null){
  748 + condition = condition.and("buildType", buildTypeNot, MongoOper.NE);
  749 + }
730 750  
  751 +
731 752 if (bookbuildingDoctor != null) {
732 753 condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS);
733 754 }
... ... @@ -867,6 +888,9 @@
867 888 //去掉type为3 的情况
868 889 if (type != null && -1 != type) {
869 890 condition = condition.and("type", type, MongoOper.IS);
  891 + }
  892 + if(typeList!=null&&typeList.size()>0){
  893 + condition = condition.and("type",typeList,MongoOper.IN);
870 894 }
871 895 if(null!=postViewTimes){
872 896 if(gtePostTimes){
platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ 71596c9
... ... @@ -21,7 +21,7 @@
21 21 //性别
22 22 private String sex;
23 23 //出生日期
24   - private Date brithDay;
  24 + private Date birthday;
25 25 //国籍
26 26 private String countryId;
27 27 //民族Id
28 28  
... ... @@ -174,12 +174,12 @@
174 174 this.sex = sex;
175 175 }
176 176  
177   - public Date getBrithDay() {
178   - return brithDay;
  177 + public Date getBirthday() {
  178 + return birthday;
179 179 }
180 180  
181   - public void setBrithDay(Date brithDay) {
182   - this.brithDay = brithDay;
  181 + public void setBirthday(Date birthday) {
  182 + this.birthday = birthday;
183 183 }
184 184  
185 185 public String getCountryId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ 71596c9
... ... @@ -36,12 +36,12 @@
36 36 */
37 37 @RequestMapping(value = "/addPremaritalCheckup", method = RequestMethod.POST)
38 38 @ResponseBody
39   -// @TokenRequired
  39 + @TokenRequired
40 40 public BaseResponse addPremaritalCheckup(@RequestBody PremaritalCheckupAddRequest addRequest,
41 41 HttpServletRequest request){
42 42 //获取当前登录用户ID
43 43 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
44   - return premaritalCheckupFacade.addPremaritalCheckup(addRequest , 1);
  44 + return premaritalCheckupFacade.addPremaritalCheckup(addRequest , loginState.getId());
45 45 }
46 46  
47 47  
... ... @@ -56,7 +56,7 @@
56 56 */
57 57 @RequestMapping(value = "/getPremaritalCheckup", method = RequestMethod.GET)
58 58 @ResponseBody
59   -// @TokenRequired
  59 + @TokenRequired
60 60 public BaseObjectResponse getPremaritalCheckup(@RequestParam(value = "vcCardNo",required = false) String vcCardNo,
61 61 @RequestParam(value = "cardNo",required = false) String certificateNum,
62 62 @RequestParam(value = "hospitalId",required = false)String hospitalId,
... ... @@ -72,7 +72,7 @@
72 72 param.setVcCardNo(vcCardNo);
73 73 param.setCertificateNum(certificateNum);
74 74 }
75   - return premaritalCheckupFacade.getPremaritalCheckup(param, 1);
  75 + return premaritalCheckupFacade.getPremaritalCheckup(param, loginState.getId());
76 76 }
77 77  
78 78 /**
79 79  
... ... @@ -83,12 +83,12 @@
83 83 */
84 84 @RequestMapping(value = "/queryPremaritalCheckup", method = RequestMethod.GET)
85 85 @ResponseBody
86   -// @TokenRequired
  86 + @TokenRequired
87 87 public BaseListResponse queryPremaritalCheckup(@Valid PremaritalCheckupQueryRequest queryRequest,
88 88 HttpServletRequest request){
89 89 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
90 90  
91   - return premaritalCheckupFacade.queryPremaritalCheckup(queryRequest, 1);
  91 + return premaritalCheckupFacade.queryPremaritalCheckup(queryRequest, loginState.getId());
92 92 }
93 93 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 71596c9
... ... @@ -1899,6 +1899,7 @@
1899 1899 data.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
1900 1900 data.put("mommyName", StringUtils.emptyDeal(model.getMname()));
1901 1901 data.put("mommnyPhone", StringUtils.emptyDeal(model.getMphone()));
  1902 + data.put("serviceType", StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType())));
1902 1903 data.put("serviceStatus", StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
1903 1904 data.put("nextDate", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
1904 1905 data.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
... ... @@ -1926,6 +1927,7 @@
1926 1927 cnames.put("birthday", "儿童生日");
1927 1928 cnames.put("mommyName", "母亲姓名");
1928 1929 cnames.put("mommnyPhone", "联系方式");
  1930 + cnames.put("serviceType", "服务类型");
1929 1931 cnames.put("serviceStatus", "服务状态");
1930 1932 cnames.put("nextDate", "下次预约时间");
1931 1933 cnames.put("monthAge", "月龄");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 71596c9
... ... @@ -631,6 +631,8 @@
631 631 data.put("checkDoctor", rp.getCheckDoctor());
632 632 data.put("lName", rp.getlName());
633 633 data.put("phone", rp.getRealPhone());
  634 + data.put("serviceType", rp.getServiceType());
  635 + data.put("serviceStatus", rp.getServiceStatus());
634 636 datas.add(data);
635 637 }
636 638 cnames.put("name", "姓名");
... ... @@ -646,7 +648,8 @@
646 648 cnames.put("checkDoctor", "产检医生");
647 649 cnames.put("lName", "登记人");
648 650 cnames.put("phone", "联系方式");
649   -
  651 + cnames.put("serviceType", "服务类型");
  652 + cnames.put("serviceStatus", "服务状态");
650 653 } else if (patientsQueryRequest.getQueryType() == 1) {
651 654 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE);
652 655 List list = listResponse.getData();
... ... @@ -656,7 +659,6 @@
656 659 data.put("name", rp.getName());
657 660 data.put("age", rp.getAge());
658 661 data.put("dueWeek", rp.getDueWeek());
659   -
660 662 data.put("rLevel", getLevel(rp.getrLevel()));
661 663 data.put("cTimes", rp.getcTimes());
662 664 data.put("cHTimes", rp.getcHTimes());
... ... @@ -666,6 +668,7 @@
666 668 data.put("lName", rp.getlName());
667 669 data.put("phone", rp.getRealPhone());
668 670 data.put("serviceType", rp.getServiceType());
  671 + data.put("serviceStatus", rp.getServiceStatus());
669 672 datas.add(data);
670 673 }
671 674 cnames.put("name", "姓名");
... ... @@ -680,6 +683,7 @@
680 683 cnames.put("lName", "登记人");
681 684 cnames.put("phone", "联系方式");
682 685 cnames.put("serviceType", "服务类型");
  686 + cnames.put("serviceStatus", "服务状态");
683 687 } else if (patientsQueryRequest.getQueryType() == 2) {
684 688 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE);
685 689 List list = listResponse.getData();
... ... @@ -696,6 +700,8 @@
696 700 data.put("checkDoctor", rp.getCheckDoctor());
697 701 data.put("lName", rp.getlName());
698 702 data.put("phone", rp.getRealPhone());
  703 + data.put("serviceType", "服务类型");
  704 + data.put("serviceStatus", "服务类型");
699 705 datas.add(data);
700 706 }
701 707 cnames.put("name", "姓名");
... ... @@ -708,6 +714,8 @@
708 714 cnames.put("checkDoctor", "检查医生");
709 715 cnames.put("phone", "联系方式");
710 716 cnames.put("lName", "登记人");
  717 + cnames.put("serviceType", "服务类型");
  718 + cnames.put("serviceStatus", "服务状态");
711 719 }
712 720 }
713 721  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ 71596c9
... ... @@ -70,12 +70,16 @@
70 70 patientsQuery.setNeed(YnEnums.YES.name());
71 71 patientsQuery.setYn(YnEnums.YES.getId());
72 72 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
73   - patientsQuery.setType(1);
  73 + List<Integer> typeList = new ArrayList<>();
  74 + typeList.add(1);
  75 + typeList.add(3);
  76 + patientsQuery.setTypeList(typeList);
74 77 patientsQuery.setSort("dueDate");
75 78 String doctorId = predictedStatisticsRequest.getDoctorId();
76 79 if (!StringUtils.isEmpty(doctorId)) {
77 80 patientsQuery.setLastCheckEmployeeId(doctorId);
78 81 }
  82 + patientsQuery.setBuildTypeNot(1);
79 83 // 查列表
80 84 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
81 85 List<PredictedStatisticsQueryModel> predictedStatisticsQueryModelList = new ArrayList<>();
... ... @@ -84,8 +88,10 @@
84 88 PredictedStatisticsQueryModel predictedStatisticsQueryModel = new PredictedStatisticsQueryModel();
85 89 BeanUtils.copy(patients, predictedStatisticsQueryModel);
86 90 predictedStatisticsQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
87   - predictedStatisticsQueryModel.setRiskLevelResultModelList(getRiskLevel(patients.getRiskLevelId()));
88   - predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getFirstRiskFactorId()));
  91 + List<RiskLevelResultModel> riskLevelResultModelList = getRiskLevel(patients.getRiskLevelId());
  92 + predictedStatisticsQueryModel.setRiskLevelResultModelList(riskLevelResultModelList);
  93 + predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList));
  94 + predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId()));
89 95 predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId()));
90 96 predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses()));
91 97 predictedStatisticsQueryModelList.add(predictedStatisticsQueryModel);
92 98  
... ... @@ -107,19 +113,23 @@
107 113 // List<PredictedStatisticsCountModel> predictedStatisticsCountModelList = patientsService.predictedStatistics();
108 114 List<PredictedStatisticsCountModel> predictedStatisticsCountModelList = new ArrayList<>();
109 115 Date date = new Date();
  116 + PatientsQuery patientsQuery = new PatientsQuery();
  117 + patientsQuery.setYn(YnEnums.YES.getId());
  118 + List<Integer> typeList = new ArrayList<>();
  119 + typeList.add(1);
  120 + typeList.add(3);
  121 + patientsQuery.setTypeList(typeList);
  122 + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
  123 + String doctorId = predictedStatisticsRequest.getDoctorId();
  124 + if (!StringUtils.isEmpty(doctorId)) {
  125 + patientsQuery.setLastCheckEmployeeId(doctorId);
  126 + }
  127 + patientsQuery.setBuildTypeNot(1);
110 128 for (int i = 0; i < 10; i++) {
111 129 Date temp = DateUtil.addMonth(date, i);
112 130 System.out.println(temp);
113 131 Date startDate = DateUtil.getMonthStart(temp);
114 132 Date endDate = DateUtil.getMonthEndTime(temp);
115   - PatientsQuery patientsQuery = new PatientsQuery();
116   - String doctorId = predictedStatisticsRequest.getDoctorId();
117   - patientsQuery.setYn(YnEnums.YES.getId());
118   - patientsQuery.setType(1);
119   - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
120   - if (!StringUtils.isEmpty(doctorId)) {
121   - patientsQuery.setLastCheckEmployeeId(doctorId);
122   - }
123 133 patientsQuery.setDueDateStart(startDate);
124 134 patientsQuery.setDueDateEnd(endDate);
125 135 int count = patientsService.queryPatientCount(patientsQuery);
126 136  
127 137  
... ... @@ -140,15 +150,20 @@
140 150 }
141 151  
142 152 private static String getGestationalWeeks(Date date) {
  153 + String str = "";
143 154 try {
144 155 long s = new Date().getTime() - date.getTime();
145 156 long d = s / (60 * 60 * 24 * 1000);
146 157 int day = (int) d;
147 158 int w = day / 7;
148 159 int dd = day % 7;
149   - return "孕" + w + "周+" + dd + "天";
  160 + str += "孕" + w + "周";
  161 + if (dd != 0) {
  162 + str += "+" + dd + "天";
  163 + }
  164 + return str;
150 165 } catch (Exception e) {
151   - return "";
  166 + return str;
152 167 }
153 168 }
154 169  
... ... @@ -170,9 +185,19 @@
170 185 if (name.contains("预警")) {
171 186 name = name.replace("预警", "");
172 187 }
173   - riskLevelResultModel.setName(name);
174   - riskLevelResultModel.setColor("risk_" + RiskDefaultTypeEnum.getColor(name));
175   - riskLevelResultModelList.add(riskLevelResultModel);
  188 + boolean flag = true;
  189 + if (riskLevelResultModelList.size() > 0) {
  190 + for (RiskLevelResultModel levelResultModel : riskLevelResultModelList) {
  191 + if (levelResultModel.getName().equals(name)) {
  192 + flag = false;
  193 + }
  194 + }
  195 + }
  196 + if (flag) {
  197 + riskLevelResultModel.setName(name);
  198 + riskLevelResultModel.setColor("risk_" + RiskDefaultTypeEnum.getColor(name));
  199 + riskLevelResultModelList.add(riskLevelResultModel);
  200 + }
176 201 } catch (Exception e) {
177 202 // 什么都不干
178 203 }
179 204  
180 205  
... ... @@ -181,16 +206,34 @@
181 206 return riskLevelResultModelList;
182 207 }
183 208  
  209 + private String getRiskLevelString(List<RiskLevelResultModel> riskLevelResultModelList) {
  210 + String str = "";
  211 + if (riskLevelResultModelList != null && riskLevelResultModelList.size() > 0) {
  212 + for (RiskLevelResultModel riskLevelResultModel : riskLevelResultModelList) {
  213 + str += riskLevelResultModel.getName();
  214 + str += ",";
  215 + }
  216 + }
  217 + if (str.length() > 0) {
  218 + return str.substring(0, str.length() - 1);
  219 + }
  220 + return "";
  221 + }
  222 +
184 223 private String getRiskFactor(List<String> list) {
185 224 String riskFactor = "";
186 225 if (list != null && list.size() > 0) {
187 226 for (String s : list) {
188 227 try {
189 228 riskFactor += basicConfigService.getOneBasicConfigById(s).getName();
  229 + riskFactor += ",";
190 230 } catch (Exception e) {
191 231 riskFactor += "";
192 232 }
193 233 }
  234 + }
  235 + if (riskFactor.length() > 0) {
  236 + return riskFactor.substring(0, riskFactor.length() - 1);
194 237 }
195 238 return riskFactor;
196 239 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 71596c9
... ... @@ -104,7 +104,7 @@
104 104 archiveMap.put("username",archiveModel.getUsername());
105 105 archiveMap.put("age", archiveModel.getAge());
106 106 archiveMap.put("sex",archiveModel.getSex());
107   - archiveMap.put("birthday",getBirthday(archiveModel.getBrithDay()));
  107 + archiveMap.put("birthday",getBirthday(archiveModel.getBirthday()));
108 108 archiveMap.put("phone",archiveModel.getPhone());
109 109 archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(),
110 110 archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 71596c9
... ... @@ -33,8 +33,8 @@
33 33 @Component
34 34 public class RiskReportFacade {
35 35  
  36 + private static ExecutorService pool = Executors.newFixedThreadPool(4);
36 37  
37   -
38 38 @Autowired
39 39 private PatientsService patientsService;
40 40  
... ... @@ -109,7 +109,7 @@
109 109 List<BasicConfig> riskLevelConfig = basicConfigService.queryBasicConfig(basicConfigQuery);
110 110 if (CollectionUtils.isNotEmpty(riskLevelConfig))
111 111 {
112   - ExecutorService pool = Executors.newFixedThreadPool(riskLevelConfig.size());
  112 +
113 113 for(BasicConfig levelConfig : riskLevelConfig)
114 114 {
115 115 if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId()))
... ... @@ -123,8 +123,7 @@
123 123 Future f = pool.submit(c);
124 124 futures.add(f);
125 125 }
126   - // 关闭线程池
127   - pool.shutdown();
  126 +
128 127 }
129 128  
130 129 if (CollectionUtils.isNotEmpty(futures))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ 71596c9
... ... @@ -27,7 +27,7 @@
27 27 //性别
28 28 private String sex;
29 29 //出生日期
30   - private String brithDay;
  30 + private String birthday;
31 31 //国籍
32 32 private String countryId;
33 33 //民族Id
... ... @@ -99,7 +99,7 @@
99 99 model.setId(id);
100 100 model.setUsername(username);
101 101 model.setSex(sex);
102   - model.setBrithDay(brithDay);
  102 + model.setBirthday(birthday);
103 103 model.setCountryId(countryId);
104 104 model.setNationId(nationId);
105 105 model.setMarriageId(marriageId);
106 106  
... ... @@ -178,12 +178,12 @@
178 178 this.sex = sex;
179 179 }
180 180  
181   - public String getBrithDay() {
182   - return brithDay;
  181 + public String getBirthday() {
  182 + return birthday;
183 183 }
184 184  
185   - public void setBrithDay(String brithDay) {
186   - this.brithDay = brithDay;
  185 + public void setBirthday(String birthday) {
  186 + this.birthday = birthday;
187 187 }
188 188  
189 189 public String getCountryId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java View file @ 71596c9
... ... @@ -41,8 +41,17 @@
41 41 */
42 42 // 需要计算
43 43 private List<RiskLevelResultModel> riskLevelResultModelList;
  44 +
44 45 /**
45 46 * @auther HuJiaqi
  47 + * @createTime 2016年12月01日 08时47分
  48 + * @discription 风险等级拼接字符串
  49 + */
  50 + // 需要计算
  51 + private String riskLevelNameString;
  52 +
  53 + /**
  54 + * @auther HuJiaqi
46 55 * @createTime 2016年11月29日 17时06分
47 56 * @discription 风险因素
48 57 */
... ... @@ -56,6 +65,14 @@
56 65 private String lastCheckEmployee;
57 66  
58 67 private String pid;
  68 +
  69 + public String getRiskLevelNameString() {
  70 + return riskLevelNameString;
  71 + }
  72 +
  73 + public void setRiskLevelNameString(String riskLevelNameString) {
  74 + this.riskLevelNameString = riskLevelNameString;
  75 + }
59 76  
60 77 public String getPid() {
61 78 return pid;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ 71596c9
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.enums.ServiceStatusEnums;
  5 +import com.lyms.platform.common.enums.ServiceTypeEnums;
4 6 import com.lyms.platform.common.utils.DateUtil;
5 7 import com.lyms.platform.common.utils.StringUtils;
6 8 import com.lyms.platform.pojo.Patients;
... ... @@ -275,6 +277,12 @@
275 277 setDueWeek("终止妊娠");
276 278 }else if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
277 279 setDueWeek("-");
  280 + }
  281 + if(null!=destModel.getServiceType()){
  282 + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
  283 + }
  284 + if(null!=destModel.getServiceStatus()){
  285 + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
278 286 }
279 287 setPid(destModel.getPid());
280 288 return this;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ 71596c9
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.enums.ServiceStatusEnums;
4 5 import com.lyms.platform.common.enums.ServiceTypeEnums;
5 6 import com.lyms.platform.common.utils.DateUtil;
6 7 import com.lyms.platform.common.utils.JsonUtil;
... ... @@ -292,6 +293,9 @@
292 293 setlName(destModel.getPublishName());
293 294 if(null!=destModel.getServiceType()){
294 295 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
  296 + }
  297 + if(null!=destModel.getServiceStatus()){
  298 + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
295 299 }
296 300 return this;
297 301 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java View file @ 71596c9
... ... @@ -3,6 +3,8 @@
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
4 4 import com.lyms.platform.common.core.annotation.form.Form;
5 5 import com.lyms.platform.common.core.annotation.form.FormParam;
  6 +import com.lyms.platform.common.enums.ServiceStatusEnums;
  7 +import com.lyms.platform.common.enums.ServiceTypeEnums;
6 8 import com.lyms.platform.common.utils.DateUtil;
7 9 import com.lyms.platform.common.utils.JsonUtil;
8 10 import com.lyms.platform.common.utils.StringUtils;
... ... @@ -306,6 +308,13 @@
306 308 this.dueWeek=StringUtils.dueWeek(days);
307 309 }
308 310 setPid(destModel.getPid());
  311 +
  312 + if(null!=destModel.getServiceType()){
  313 + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
  314 + }
  315 + if(null!=destModel.getServiceStatus()){
  316 + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
  317 + }
309 318 return this;
310 319 }
311 320 }