yeguodong 1 miesiąc temu
rodzic
commit
9f346ede54

+ 5 - 6
src/main/java/cn/hnthyy/thmz/controller/mz/ZyReqController.java

@@ -33,11 +33,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -279,7 +275,10 @@ public class ZyReqController {
             mzZyReq.setDeptCode(employee.getDeptCode());
         }
         mzZyReq.setDoctorCode(user.getUserIdCode());
+        Date visitDate = new Date();
+        mzZyReq.setVisitDate(visitDate);
         mzZyReqService.banLiZyReq(mzZyReq,mzPatientMi);
-        return R.ok("成功");
+        return R.ok().put("data", visitDate);
+
     }
 }

+ 5 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzZyReqServiceImpl.java

@@ -154,7 +154,11 @@ public class MzZyReqServiceImpl implements MzZyReqService {
         mzZyReq.setIcdCodeNew(mzZyReq.getIcdCode());
         mzZyReq.setIcdTextNew(mzZyReq.getIcdText());
         mzZyReq.setReqStatus(ZyReqEnum.UN_CONFIRM.code);
-        mzZyReq.setVisitDate(new Date());
+        Date visitDate = mzZyReq.getVisitDate();
+        if(visitDate == null) {
+            visitDate = new Date();
+        }
+        mzZyReq.setVisitDate(visitDate);
         mzZyReq.setName(mzPatientMi.getName());
         mzZyReq.setPatientId(mzPatientMi.getPatientId());
         mzZyReq.setResponceType(Convert.toInt(NumberEnum.FOUR.getCode()).equals(mzZyReq.getRouteOfAdmission()) ? Constants.GCP_RESPONCE_TYPE_CODE : mzPatientMi.getResponseType());

+ 3 - 1
src/main/resources/static/js/mz/add_mzzyreq.js

@@ -224,6 +224,7 @@ function saveData() {
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         data: JSON.stringify(s_data),
         success: function (res) {
+            let visitDate = format(res.data,'yyyy-MM-dd HH:mm:ss');
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -232,7 +233,8 @@ function saveData() {
                 $("#editModal").modal("hide");
                 clearZyReq();
                 //successMesage(res);
-                printZyReq($("#patientId").val(),1)
+
+                printZyReq($("#patientId").val(),1, visitDate)
             } else {
                 errorMesage(res);
             }