jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 83f97ea49554b24a57b418a81121cf619c1fad50

Authored by liquanyu
1 parent 79271db67b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

服务

Showing 2 changed files with 28 additions and 33 deletions

platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml View file @ 83f97ea
... ... @@ -31,34 +31,11 @@
31 31  
32 32 <insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
33 33 insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,
34   - update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,
35   - per_type
36   - ,device
37   - ,deviceCon
38   - ,doctorWeek
39   - ,serviceWeek
40   - ,serStartWeek
41   - ,serEndWeek
42   - ,serStartTime
43   - ,serEndTime
44   - ,docStartWeek
45   - ,docEndWeek
46   - ,docStartTime
47   - ,docEndTime
  34 + update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type
  35 + ,device,deviceCon,doctorWeek,serviceWeek,serStartWeek,serEndWeek,serStartTime,serEndTime,docStartWeek,docEndWeek,docStartTime,docEndTime
48 36 ) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},
49 37 #{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld},#{perType}
50   - , #{device}
51   - , #{deviceCon}
52   - , #{doctorWeek}
53   - , #{serviceWeek}
54   - , #{serStartWeek}
55   - , #{serEndWeek}
56   - , #{serStartTime}
57   - , #{serEndTime}
58   - , #{docStartWeek}
59   - , #{docEndWeek}
60   - , #{docStartTime}
61   - , #{docEndTime}
  38 + ,#{device},#{deviceCon},#{doctorWeek},#{serviceWeek},#{serStartWeek},#{serEndWeek},#{serStartTime},#{serEndTime},#{docStartWeek},#{docEndWeek},#{docStartTime},#{docEndTime}
62 39 )
63 40 </insert>
64 41  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 83f97ea
... ... @@ -314,13 +314,13 @@
314 314 pser.setDevice(Integer.parseInt(serInfo.get("device")));
315 315 }
316 316 if (serInfo.containsKey("deviceCon")) {
317   - pser.setDevice(Integer.parseInt(serInfo.get("deviceCon")));
  317 + pser.setDeviceCon(Integer.parseInt(serInfo.get("deviceCon")));
318 318 }
319 319 if (serInfo.containsKey("doctorWeek")) {
320   - pser.setDevice(Integer.parseInt(serInfo.get("doctorWeek")));
  320 + pser.setDoctorWeek(Integer.parseInt(serInfo.get("doctorWeek")));
321 321 }
322 322 if (serInfo.containsKey("serviceWeek")) {
323   - pser.setDevice(Integer.parseInt(serInfo.get("serviceWeek")));
  323 + pser.setServiceWeek(Integer.parseInt(serInfo.get("serviceWeek")));
324 324 }
325 325 Patients patients = patientsService.findOnePatientById(ps.getParentid());
326 326 setServiceRecordAdd(pser, patients);
327 327  
328 328  
329 329  
330 330  
331 331  
... ... @@ -391,17 +391,35 @@
391 391  
392 392 if (serviceWeek != null)
393 393 {
  394 +
  395 + Date endTime = DateUtil.addWeek(new Date(), serviceWeek);
  396 + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
  397 + {
  398 + endTime = DateUtil.addWeek(lastMenses, 42);
  399 + }
  400 + Integer endWeek = DateUtil.getWeek(lastMenses, new Date()) + serviceWeek;
  401 + endWeek = endWeek > 42 ? 42 : endWeek;
  402 +
394 403 pser.setSerStartTime(new Date());
395   - pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
  404 + pser.setSerEndTime(endTime);
396 405 pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
397   - pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek);
  406 + pser.setSerEndWeek(endWeek);
398 407 }
399 408 if (doctorService != null)
400 409 {
  410 + Date endTime = DateUtil.addWeek(new Date(), doctorService);
  411 + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
  412 + {
  413 + endTime = DateUtil.addWeek(lastMenses, 42);
  414 + }
  415 +
  416 + Integer endWeek = DateUtil.getWeek(lastMenses, new Date()) + doctorService;
  417 + endWeek = endWeek > 42 ? 42 : endWeek;
  418 +
401 419 pser.setDocStartTime(new Date());
402   - pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek));
  420 + pser.setDocEndTime(endTime);
403 421 pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
404   - pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService);
  422 + pser.setDocEndWeek(endWeek);
405 423 }
406 424 }
407 425