From cb7ba105e4d14d1c2d6fb9db287bc4cc58417c1b Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 22 十二月 2023 14:33:57 +0800
Subject: [PATCH] 1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   83 ++++++++++++++++++++++++-----------------
 1 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index d29fced..4169457 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -200,12 +200,12 @@
 //            return getResult(page, pageSize, orderList, customerList, map);
 //        }
         String value = String.valueOf(compId);
-        if(tjNumber==null)tjNumber="";
-        if(compId==null)value="";
-        if(name==null)name="";
-        if(beginTime==null)beginTime="";
-        if(endTime==null)endTime="";
-        return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
+        if (tjNumber == null) tjNumber = "";
+        if (compId == null) value = "";
+        if (name == null) name = "";
+        if (beginTime == null) beginTime = "";
+        if (endTime == null) endTime = "";
+        return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
     }
 
 
@@ -215,27 +215,37 @@
     @GetMapping("/cSWebGetProByTjNumAndOrderId")
     @ApiOperation(value = "(鍒濆椤甸潰)鐐瑰嚮浣撴浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
     public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
-        List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
-        List<CsProVo> list = new ArrayList<>();
-        if (null != orderRemarkList && orderRemarkList.size() > 0) {
-            for (TjOrderRemark remark : orderRemarkList) {
-                CsProVo vo = new CsProVo();
-                vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName());
-                vo.setProName(projectService.getById(remark.getProId()).getProName());
-                vo.setType(remark.getType());
-                if (null != remark.getDoctorName()) {
-                    vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
-                    vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName());
-                }
-                vo.setSffs("缁熸敹");
-                vo.setIsPay("宸叉敹璐�");
-                vo.setQdcreateTime(remark.getCreateTime());
-                vo.setBcupdateTime(remark.getUpdateTime());
-                vo.setZhupdateTime(remark.getUpdateTime());
-                list.add(vo);
-            }
+//        List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
+//        List<CsProVo> list = new ArrayList<>();
+//        if (null != orderRemarkList && orderRemarkList.size() > 0) {
+//            for (TjOrderRemark remark : orderRemarkList) {
+//                CsProVo vo = new CsProVo();
+//                vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName());
+//                vo.setProName(projectService.getById(remark.getProId()).getProName());
+//                vo.setType(remark.getType());
+//                if (null != remark.getDoctorName()) {
+//                    vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+//                    vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName());
+//                }
+//                vo.setSffs("缁熸敹");
+//                vo.setIsPay("宸叉敹璐�");
+//                vo.setQdcreateTime(remark.getCreateTime());
+//                vo.setBcupdateTime(remark.getUpdateTime());
+//                vo.setZhupdateTime(remark.getUpdateTime());
+//                list.add(vo);
+//            }
+//            List<CsProVo> list1 = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+//            Collections.sort(list, new Comparator<CsProVo>() {
+//                @Override
+//                public int compare(CsProVo o1, CsProVo o2) {
+//                    return o1.getType() - o2.getType();
+//                }
+//            });
+//        }
 
-            Collections.sort(list, new Comparator<CsProVo>() {
+        List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+        if (null != list && list.size() > 0) {
+            list.sort(new Comparator<CsProVo>() {
                 @Override
                 public int compare(CsProVo o1, CsProVo o2) {
                     return o1.getType() - o2.getType();
@@ -266,7 +276,7 @@
             if (null != tjOrder) {
                 tjOrder.setConfirmTime(new DateTime());
                 tjOrder.setConfirmDoctor(sysUser.getNickName());
-                tjOrder.setConfirmStatus(remark);
+                tjOrder.setConfirmStatus(String.valueOf(status));
                 if (status == 0) {
                     tjOrder.setStatus(TjConstants.TJ_CHECK);
                     asyncService.updateCheckType(tjNumber);
@@ -439,12 +449,12 @@
 //            return getResult(page, pageSize, orderList, customerList, map);
 //        }
         String value = String.valueOf(compId);
-        if(tjNumber==null)tjNumber="";
-        if(compId==null)value="";
-        if(name==null)name="";
-        if(beginTime==null)beginTime="";
-        if(endTime==null)endTime="";
-        return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
+        if (tjNumber == null) tjNumber = "";
+        if (compId == null) value = "";
+        if (name == null) name = "";
+        if (beginTime == null) beginTime = "";
+        if (endTime == null) endTime = "";
+        return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
     }
 
     /**
@@ -533,6 +543,10 @@
                 Map<String, Object> parent = new HashMap<>();
                 parent.put("checkAdvice", one.getCheckAdvice());
                 TjProject project = projectService.selectTjProjectByProId(remark.getProId());
+                //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+                if ("N".equals(project.getNeedReport())){
+                    continue;
+                }
                 if (null != project) {
                     parent.put("parent", project.getProName());
                     parent.put("parentId", project.getProId().toString());
@@ -553,7 +567,7 @@
                             tjOrderDetail.setStandard(list2.get(0));
                         } else {
                             final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
-                            TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
+                            TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(),ageType,String.valueOf(tjOrderDetail.getProId()));
                             tjOrderDetail.setStandard(tjStandard1);
                         }
                     }
@@ -580,7 +594,6 @@
                 } else {
                     return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
                 }
-//                }
             }
             return AjaxResult.success(list);
         }

--
Gitblit v1.8.0