Ver código fonte

医生开方操作时间业务

wjj 2 semanas atrás
pai
commit
300b2b38de

+ 5 - 0
fs-service/src/main/java/com/fs/his/param/FsPrescribeParam.java

@@ -157,4 +157,9 @@ public class FsPrescribeParam {
 
     /** 组别 */
     private String groupCode;
+
+    /** 医生开始操作时间戳 */
+
+    private Long startOperateTime;
+
 }

+ 10 - 4
fs-service/src/main/java/com/fs/his/service/impl/FsPrescribeServiceImpl.java

@@ -1189,11 +1189,17 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         fsPrescribe.setDoctorConfirm(1);
         //医生操作结束时间(第一次确认处方)
         if (fsPrescribe.getEndOperateTime() == null) {
-            fsPrescribe.setEndOperateTime(DateUtils.getNowDate());
-            if (fsPrescribe.getStartOperateTime() != null && fsPrescribe.getEndOperateTime() != null) {
-                Long seconds = DateUtil.between(fsPrescribe.getStartOperateTime(), fsPrescribe.getEndOperateTime(), DateUnit.SECOND);
-                fsPrescribe.setOperateSecond(seconds);
+            if (param.getStartOperateTime() == null) {
+                throw new RuntimeException("操作时间参数错误,开方失败");
             }
+            fsPrescribe.setStartOperateTime(new Date(param.getStartOperateTime()));
+            fsPrescribe.setEndOperateTime(DateUtils.getNowDate());
+            Long seconds = DateUtil.between(fsPrescribe.getStartOperateTime(), fsPrescribe.getEndOperateTime(), DateUnit.SECOND);
+            fsPrescribe.setOperateSecond(seconds);
+//            if (fsPrescribe.getStartOperateTime() != null && fsPrescribe.getEndOperateTime() != null) {
+//                Long seconds = DateUtil.between(fsPrescribe.getStartOperateTime(), fsPrescribe.getEndOperateTime(), DateUnit.SECOND);
+//                fsPrescribe.setOperateSecond(seconds);
+//            }
         }
         //待审核
         fsPrescribe.setStatus(0);