jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ed0ec807d77f72d324f9221547027c5770a96d04

Authored by yangfei
2 parents eeca824721 aa8a9e5c0b
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-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveRecordService.java View file @ ed0ec80
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.query.SieveRecordQuery;
7 7 import org.apache.commons.lang.StringUtils;
8 8 import org.springframework.beans.factory.annotation.Autowired;
  9 +import org.springframework.data.domain.Sort;
9 10 import org.springframework.stereotype.Service;
10 11  
11 12 import java.util.List;
... ... @@ -27,7 +28,7 @@
27 28 query.start(sieveRecordQuery.getOffset()).end(sieveRecordQuery.getLimit());
28 29 }
29 30  
30   - return sieveRecordDao.query(query);
  31 + return sieveRecordDao.query(query.addOrder(Sort.Direction.DESC, "created"));
31 32 }
32 33  
33 34 public void save(SieveRecordModel model) {
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ ed0ec80
... ... @@ -975,6 +975,21 @@
975 975 }
976 976  
977 977 /**
  978 + * 获取孕周
  979 + * @param start
  980 + * @param end
  981 + * @return
  982 + */
  983 + public static Integer getWeek2(Date start, Date end) {
  984 + if(start == null || end == null) {
  985 + return null;
  986 + }
  987 + Integer betweenDay = DateUtil.getDays(start, end);
  988 + Integer week = betweenDay / 7;
  989 + return week;
  990 + }
  991 +
  992 + /**
978 993 * 获取两个日期相差几个月
979 994 * @param start
980 995 * @param end
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ ed0ec80
... ... @@ -76,6 +76,8 @@
76 76 @Autowired
77 77 private BabyCheckService babyCheckService;
78 78  
  79 + @Autowired
  80 + private PostReviewService postReviewService;
79 81  
80 82 @Autowired
81 83 private BabyCheckFacade babyCheckFacade;
... ... @@ -337,6 +339,52 @@
337 339  
338 340 return "update finish";
339 341 }
  342 +
  343 +
  344 + /**
  345 + * 修正产后复查次数
  346 + * @param hospitalId
  347 + * @return
  348 + */
  349 + @RequestMapping(value = "/updatePostViewTimes", method = RequestMethod.GET)
  350 + @ResponseBody
  351 + public String updatePostViewTimes(@RequestParam(required = true) String hospitalId,@RequestParam(required = false) String patientId) {
  352 + PatientsQuery patientsQuery1 = new PatientsQuery();
  353 + patientsQuery1.setYn(YnEnums.YES.getId());
  354 + patientsQuery1.setHospitalId(hospitalId);
  355 + patientsQuery1.setType(3); //查询产妇
  356 + patientsQuery1.setExtEnable(false);
  357 + patientsQuery1.setId(patientId);
  358 + List<Patients> pats = patientsService.queryPatient(patientsQuery1);
  359 + System.out.println("main="+pats.size());
  360 + if (CollectionUtils.isNotEmpty(pats)) {
  361 + for (Patients pat : pats) {
  362 + if (StringUtils.isNotEmpty(pat.getPid()))
  363 + {
  364 + PostReviewQuery postReviewQuery = new PostReviewQuery();
  365 + postReviewQuery.setPid(pat.getPid());
  366 + postReviewQuery.setYn(YnEnums.YES.getId());
  367 + List<PostReviewModel> postReviewModels = postReviewService.findWithList(postReviewQuery);
  368 + if (CollectionUtils.isNotEmpty(postReviewModels))
  369 + {
  370 + System.out.println("postReviewModels="+postReviewModels.size()+";patientid="+pat.getId());
  371 + for(PostReviewModel postReviewModel : postReviewModels)
  372 + {
  373 + Patients patients = patientsService.findOnePatientById(postReviewModel.getParentId());
  374 + patients.setPostViewTimes(postReviewModels.size());
  375 + patientsService.updatePatient(patients);
  376 + }
  377 + }
  378 +
  379 + }
  380 +
  381 + }
  382 + }
  383 + return "updatePostViewTimes finish";
  384 + }
  385 +
  386 +
  387 +
340 388  
341 389 @RequestMapping(value = "/rebuildDefaultRoles", method = RequestMethod.GET)
342 390 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ ed0ec80
... ... @@ -129,35 +129,49 @@
129 129  
130 130  
131 131 //修改非主档案 同时修改主档案的产后复查次数增加
132   - if (StringUtils.isNotEmpty(patients1.getSource()))
  132 + if (StringUtils.isNotEmpty(patients1.getPid()))
133 133 {
134   - Patients mainPatients = patientsService.findOnePatientById(patients1.getSource());
  134 + PatientsQuery patientsQuery1 = new PatientsQuery();
  135 + patientsQuery1.setYn(YnEnums.YES.getId());
  136 + patientsQuery1.setPid(patients1.getPid());
135 137  
136   - if (null != patients1.getPostViewTimes()) {
  138 + List<Patients> pats = patientsService.queryPatient(patientsQuery1);
  139 +
  140 + if (null != patients1.getPostViewTimes())
  141 + {
137 142 Patients patients2 = new Patients();
138 143 patients2.setPostViewTimes(patients1.getPostViewTimes() + 1);
139   - patients2.setId(mainPatients.getId());
140   - patientsService.updatePatient(patients2);
141   - } else {
  144 + for (Patients pat : pats)
  145 + {
  146 + patients2.setId(pat.getId());
  147 + patientsService.updatePatient(patients2);
  148 + }
  149 +
  150 + }
  151 + else
  152 + {
142 153 Patients patients2 = new Patients();
143 154 patients2.setPostViewTimes(1);
144   - patients2.setId(mainPatients.getId());
145   - patientsService.updatePatient(patients2);
146   - }
  155 + for (Patients pat : pats)
  156 + {
  157 + patients2.setId(pat.getId());
  158 + patientsService.updatePatient(patients2);
  159 + }
147 160  
  161 + }
148 162 }
149 163  
150   - if (null != patients1.getPostViewTimes()) {
151   - Patients patients2 = new Patients();
152   - patients2.setPostViewTimes(patients1.getPostViewTimes() + 1);
153   - patients2.setId(patients1.getId());
154   - patientsService.updatePatient(patients2);
155   - } else {
156   - Patients patients2 = new Patients();
157   - patients2.setPostViewTimes(1);
158   - patients2.setId(patients1.getId());
159   - patientsService.updatePatient(patients2);
160   - }
  164 +// if (null != patients1.getPostViewTimes()) {
  165 +// Patients patients2 = new Patients();
  166 +// patients2.setPostViewTimes(patients1.getPostViewTimes() + 1);
  167 +// patients2.setId(patients1.getId());
  168 +// patientsService.updatePatient(patients2);
  169 +// } else {
  170 +// Patients patients2 = new Patients();
  171 +// patients2.setPostViewTimes(1);
  172 +// patients2.setId(patients1.getId());
  173 +// patientsService.updatePatient(patients2);
  174 +// }
161 175  
162 176  
163 177 patientsService.updateNextCheckTime(postReviewRequest.getNextCheckTime(),patients.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java View file @ ed0ec80
... ... @@ -85,10 +85,13 @@
85 85 //id不为空就修改记录
86 86 if (StringUtils.isNotEmpty(requestModel.getId()))
87 87 {
  88 + model.setModified(new Date());
88 89 sieveRecordService.update(model,requestModel.getId());
89 90 }
90 91 else
91 92 {
  93 + model.setModified(new Date());
  94 + model.setCreated(new Date());
92 95 model.setOperUserId(userId);
93 96 sieveRecordService.save(model);
94 97 }
... ... @@ -111,7 +114,7 @@
111 114 private SieveRecordModel getPatientsData(YunBookbuildingAddRequest yunRequest) {
112 115 SieveRecordModel patient = new SieveRecordModel();
113 116  
114   - patient.setPatientId(yunRequest.getId());
  117 + patient.setPatientId(yunRequest.getPatientdId());
115 118  
116 119 patient.setMensStartDay(yunRequest.getMensStartDay());
117 120  
... ... @@ -248,7 +251,7 @@
248 251 String[] dates = createTime.split(" - ");
249 252 query.setCreateTimeStart(DateUtil.parseYMD(dates[0]));
250 253 if (dates.length == 2) {
251   - query.setCreateTimeEnd(DateUtil.parseYMD(dates[1]));
  254 + query.setCreateTimeEnd(DateUtil.parseYMDHMS(dates[1]+" 23:59:59"));
252 255 }
253 256 }
254 257  
255 258  
... ... @@ -275,9 +278,9 @@
275 278 map.put("certeTypeId",model.getPcerteTypeId()); //证件类型
276 279 map.put("phone",model.getPhone());//手机号码
277 280 map.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); //出生日期
278   - map.put("age",DateUtil.getAge(model.getBirth(), model.getCreated())); //年龄
  281 + map.put("age",DateUtil.getAge(model.getBirth(), new Date())); //年龄
279 282 map.put("lastMenses",DateUtil.getyyyy_MM_dd(model.getLastMenses())); //末次月经
280   - map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), model.getCreated())); //当前孕周
  283 + map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), new Date())); //当前孕周
281 284 map.put("dueDate",DateUtil.getyyyy_MM_dd(model.getDueDate())); //预产期
282 285 map.put("created",DateUtil.gety_m_dhm(model.getCreated()));//创建日期
283 286 map.put("status",model.getStatus());//导出状态
... ... @@ -313,7 +316,7 @@
313 316 try {
314 317 out = response.getOutputStream();
315 318 Map<String, String> cnames = new LinkedHashMap<>();
316   - cnames.put("username","身份证号码"); //身份证号码
  319 + cnames.put("username","姓名"); //姓名
317 320 cnames.put("vcCardNo","就诊卡号"); //就诊卡号
318 321 cnames.put("cardNo","证件号"); //证件号
319 322 cnames.put("phone","手机号码");//手机号码
... ... @@ -397,7 +400,6 @@
397 400 SieveRecordQuery query = new SieveRecordQuery();
398 401 query.setYn(YnEnums.YES.getId());
399 402 query.setId(id);
400   - query.setStatus(0);
401 403 PregnantInfoResult result = new PregnantInfoResult();
402 404 List<SieveRecordModel> list = sieveRecordService.query(query);
403 405 if (list != null && list.size() > 0) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ ed0ec80
... ... @@ -190,6 +190,16 @@
190 190  
191 191 private Boolean sendCoupon;
192 192  
  193 + private String patientdId;
  194 +
  195 + public String getPatientdId() {
  196 + return patientdId;
  197 + }
  198 +
  199 + public void setPatientdId(String patientdId) {
  200 + this.patientdId = patientdId;
  201 + }
  202 +
193 203 public Integer getDueStatus() {
194 204 return dueStatus;
195 205 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ ed0ec80
... ... @@ -215,13 +215,14 @@
215 215 if(patientWeight != null) {
216 216 Map<String, Object> map = new HashMap<>();
217 217 Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
  218 + Integer week = null;
218 219 if(patients != null) {
219 220 map.put("vcCard", patients.getVcCardNo());
220 221 map.put("username", patients.getUsername());
221 222 map.put("phone", patients.getPhone());
222 223 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
223 224 map.put("age", DateUtil.getAge(patients.getBirth()));
224   - Integer week = DateUtil.getWeek(patients.getLastMenses(), new Date()) - 1;
  225 + week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
225 226 String yunqi = "";
226 227 if(week <= 12) {
227 228 yunqi = "孕早期";
228 229  
... ... @@ -237,9 +238,7 @@
237 238 map.put("bmi", patientWeight.getBmi());
238 239 map.put("nowWeight", patientWeight.getNowWeight());
239 240 map.put("pregnancy", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
240   - Integer week = DateUtil.getWeek(patients.getLastMenses(), new Date());
241 241 if(week != null) {
242   - week = week - 1; //他们写的计算周的方法有问题 会多一周
243 242 setInfo(week, map); // 设置孕期相关营养信息
244 243 setRecipe(week, map); // 设置食谱
245 244 setGuide(week, map); // 设置指南