From 46f0694ffeaee5168a77d8935784963a3f8ee7aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 四月 2025 18:04:54 +0800
Subject: [PATCH] zjh20250411

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java         |   21 +
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java |  242 +++++++++++++++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java            |    2 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java   |    5 
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java                 |   14 +
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java              |   14 
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java                    |    3 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java                 |    4 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java   |    5 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java           |    2 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java            |    4 
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java              |    3 
 ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml                         |   16 +
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java               |    8 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java      |   20 +
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java                 |    2 
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java     |   10 
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java                       |   28 ++
 ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml                |  415 ++++++++++++++++-------------
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java              |    6 
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java   |    6 
 21 files changed, 629 insertions(+), 201 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 16c8c62..2142aa0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -61,7 +62,14 @@
         startPage();
         LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
         if (tjRules.getProId() != null) {
-            wq.eq(TjRules::getProId, tjRules.getProId());
+            List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
+            if(null !=projects && !projects.isEmpty()){
+                wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
+                        .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
+            }else {
+                wq.eq(TjRules::getProId, tjRules.getProId());
+            }
+
         }
         if (tjRules.getProName() != null) {
             wq.like(TjRules::getProName, tjRules.getProName());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 78d6b3e..ffbea94 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -1,24 +1,31 @@
 package com.ltkj.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.entity.SysUser;
 import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.SecurityUtils;
 import com.ltkj.framework.config.MatchUtils;
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.vodomain.CsProVo;
 import com.ltkj.system.service.ISysConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import com.ltkj.common.annotation.Log;
 import com.ltkj.common.core.controller.BaseController;
@@ -36,6 +43,7 @@
 @RestController
 @RequestMapping("/picture/picture")
 @Api(tags = "浣撴蹇冪數鍥剧鐞�")
+@Slf4j
 public class TjXdPictureController extends BaseController {
     @Resource
     private ITjXdPictureService tjXdPictureService;
@@ -51,6 +59,12 @@
     private ITjOrderRemarkService remarkService;
     @Resource
     private ITjProjectService projectService;
+    @Resource
+    private TjXdtgmdjgService xdtgmdjgService;
+    @Resource
+    private LtkjExamJcbgdService jcbgdService;
+    @Resource
+    private LtkjExamJcsqdService jcsqdService;
 
     /**
      * 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
@@ -189,4 +203,224 @@
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(tjXdPictureService.deleteTjXdPictureByIds(ids));
     }
+
+
+
+
+    @GetMapping ("/getYxJcList")
+    @ApiOperation (value = "褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)")//0寰�1宸�
+    @Transactional
+    public AjaxResult getYxJcList(@ApiParam (value = "瀹℃牳鐘舵��  0寰呭鏍�  1宸插鏍�") @RequestParam  Integer checkStatus,
+                                  @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
+                                  @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+                                  @ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
+                                  @ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
+                                  @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+                                  @ApiParam (value = "濂楅鍚�)") @RequestParam (required = false) String tcm,
+                                  @ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
+                                  @ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
+
+//        DateTime beginTimes = null;
+//        DateTime endTimes = null;
+//        if (null != beginTime && null != endTime) {
+//            beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
+//            endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
+//        }
+//        //鍒濆鍖栦綋妫�璁㈠崟琛�
+//        List<TjOrder> orderList = null;
+//        List<TjCustomer> customerList = new ArrayList<>();
+//        Map<String, Object> map = new HashMap<>();
+//
+//        if (checkStatus == 0)
+//            asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
+//        if (checkStatus == 1)
+//            asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
+//
+//        //鏍规嵁濮撳悕鏌ヨ
+//        if (null != name && !"".equals(name)) {
+//            List<TjCustomer> list = customerService.getTjCustomerList(name);
+//            if (null != list && list.size() > 0) {
+//                List<TjCustomer> lists = new ArrayList<>();
+//                for (TjCustomer customer : list) {
+//                    orderList = orderService.getCsTjOrderListByCusId(customer.getCusId());
+//                    if (null != orderList && orderList.size() > 0) {
+//                        for (TjOrder tjOrder : orderList) {
+//                            customer.setTjNumber(tjOrder.getTjNumber());
+//                            customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+//                            customer.setOrderId(tjOrder.getOrderId());
+//                            customer.setTjTime(tjOrder.getCreateTime());
+//                            customer.setFinishTime(tjOrder.getFinishTime());
+//                            customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+//                            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+//                            customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+//                            customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+//                            if (tjOrder.getFirmId().equals("0")) {
+//                                customer.setTjCompName(null);
+//                            } else {
+//                                customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
+//                            }
+//                            lists.add(customer);
+//                        }
+//                    }
+//                }
+//                List<TjCustomer> customers = null;
+//                if (lists.size() > 0) {
+//                    customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+//                }
+//                map.put("customers", customers);
+//                map.put("total", lists.size());
+//                return AjaxResult.success(map);
+//            }
+//            return AjaxResult.success("鏆傛棤鏁版嵁");
+//        }
+//
+//        //鏉′欢鏌ヨ
+//        if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
+//            orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+//            return getResult(page, pageSize, orderList, customerList, map);
+//        }
+//
+//        List<TjCustomer> customers = null;
+//        if (checkStatus == 0) {
+//            customers = redisCache.getCacheMapValue("cScheck", "ws");
+//        }
+//        if (checkStatus == 1) {
+//            customers = redisCache.getCacheMapValue("cScheck", "ys");
+//        }
+//        if (customers != null && customers.size() > 0) {
+//            List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+//            map.put("customers", customerLists);
+//            map.put("total", customers.size());
+//            return AjaxResult.success(map);
+//        } else {
+//            orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+//            return getResult(page, pageSize, orderList, customerList, map);
+//        }
+        Long deptId = SecurityUtils.getDeptId();
+        log.info("褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)鎺ュ彛 褰撳墠鐧诲綍浜虹瀹�"+deptId);
+        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 = "";
+        if (tcm == null) tcm = "";
+        return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm,deptId.toString()));
+    }
+
+    @GetMapping ("/getYxJcXx")
+    @ApiOperation (value = "褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
+    public AjaxResult getYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+        Long deptId = SecurityUtils.getDeptId();
+        log.info("褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛褰撳墠鐧诲綍浜虹瀹�"+deptId);
+        List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping ("/addYxJcXx")
+    @ApiOperation (value = "鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public AjaxResult addYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
+                                @ApiParam (value = "椤圭洰id") @RequestParam String proId,
+                                @ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
+                                @ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
+        try {
+            SysUser user = SecurityUtils.getLoginUser().getUser();
+            TjOrder order = orderService.getOrderByTjNum(tjNumber);
+            if(null !=order){
+                TjProject project = projectService.getById(proId);
+                if(null !=project){
+                    List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
+                    LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
+                    wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
+                    wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
+                    TjOrderDetail detail = detailService.getOne(wq1);
+                    if(null !=detail){
+                        detail.setProResult(jcjl+"銆�"+jcsj);
+                        detail.setTjStatus(1L);
+                        detailService.updateById(detail);
+                        LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
+                        wq2.eq(TjOrderRemark::getProId,proId);
+                        wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
+                        TjOrderRemark orderRemark = remarkService.getOne(wq2);
+                        if(null !=orderRemark){
+                            orderRemark.setType(1);
+                            remarkService.updateById(orderRemark);
+                            xdtgmdjgService.deletedByTJhAndProId(tjNumber, proId);
+                            TjXdtgmdjg xdtgmdjg=new TjXdtgmdjg();
+                            xdtgmdjg.setTjh(tjNumber);
+                            xdtgmdjg.setCardId(order.getCardId());
+                            xdtgmdjg.setProId(proId);
+                            xdtgmdjg.setProName(project.getProName());
+                            xdtgmdjg.setJcsj(jcsj);
+                            xdtgmdjg.setJcjl(jcjl);
+                            xdtgmdjg.setCreateBy(user.getNickName());
+                            xdtgmdjg.setCreateId(user.getUserId().toString());
+                            xdtgmdjgService.save(xdtgmdjg);
+                            saveTjXdtgmdjgByJcbgd(xdtgmdjg);
+                        }
+                    }
+                }
+                return AjaxResult.success();
+            }
+            return AjaxResult.error("鏆傛棤浣撴璁板綍");
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�"+e.getMessage());
+            throw new RuntimeException("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�");
+        }
+    }
+    @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
+    public void saveTjXdtgmdjgByJcbgd(TjXdtgmdjg xdtgmdjg) {
+        try {
+            int length = xdtgmdjg.getProId().length();
+            // 纭繚瀛楃涓查暱搴﹁嚦灏戜负6
+            String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
+            Date date = new Date();
+            LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
+            jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+            jcbgdService.deletedLtkjJcbgdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+            jcbgd.setTjh(xdtgmdjg.getCardId());
+            jcbgd.setTmh(xdtgmdjg.getTjh()+last6);
+            jcbgd.setXmdm(xdtgmdjg.getProId());
+            jcbgd.setXmmc(xdtgmdjg.getProName());
+            jcbgd.setBgNr(xdtgmdjg.getJcsj());
+            jcbgd.setBgUrl("");
+            jcbgd.setShysxm(xdtgmdjg.getCreateBy());
+            jcbgd.setShysdm(xdtgmdjg.getCreateId());
+            jcbgd.setYxzd(xdtgmdjg.getJcjl());
+            jcbgd.setYxbx("鏈寮傚父");
+            jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
+            jcbgd.setJcbw("");
+            jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
+            jcbgd.setCreateTime(date);
+            jcbgdService.save(jcbgd);
+            jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    @GetMapping ("/getYxJcXxJg")
+    @ApiOperation (value = "鑾峰彇褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
+    @Transactional
+    public AjaxResult getYxJcXxJg(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
+                                  @ApiParam (value = "椤圭洰id") @RequestParam String proId) {
+        TjOrder order = orderService.getOrderByTjNum(tjNumber);
+        if(null !=order){
+            LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+            wq.eq(TjXdtgmdjg::getTjh,tjNumber);
+            wq.eq(TjXdtgmdjg::getProId,proId);
+            TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
+            Map<String,Object>map=new HashMap<>();
+            if(null !=xdtgmdjg ){
+                map.put("jcsj",xdtgmdjg.getJcsj());
+                map.put("jcjl",xdtgmdjg.getJcjl());
+                return AjaxResult.success(map);
+            }
+            return AjaxResult.success(map);
+        }
+        return AjaxResult.error("鏆傛棤浣撴璁板綍");
+    }
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java
index 94e657a..7f57ef4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java
@@ -132,6 +132,8 @@
     @ExcelImport(value = "鏄惁閲嶅ぇ鐤剧梾", kv = "Y-鉁�")
     private String sfzdjb;
 
+    private String xb;
+
 
     @Override
     public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
new file mode 100644
index 0000000..5852cff
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdtgmdjg.java
@@ -0,0 +1,28 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * ClassName: tjXdtgmdjg <br/>
+ * Description: <br/>
+ * date: 2025/3/31 15:20<br/>
+ *
+ * @author zjh<br />
+ */
+@Data
+public class TjXdtgmdjg extends BaseEntity {
+    @TableId(type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long Id;
+    private String tjh;
+    private String cardId;
+    private String proId;
+    private String proName;
+    private String jcsj;
+    private String jcjl;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index a29df16..1aa7371 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -7,6 +7,7 @@
 import com.ltkj.hosp.sqlDomain.LtkjHybgd;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -20,15 +21,20 @@
 //@DataSource(value = DataSourceType.MASTER)
 public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
 
-    @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
-    void  deletedLtkjJcbgdByTjhAndTmh(String tmh);
+    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
+    void deletedLtkjJcbgdByTjhAndTmh(String tmh);
 
-    @Select ("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
+    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
     List<String> getJianJcBaoGaoDan(String cardId);
 
     @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} GROUP BY xmmc ")
     List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
 
-@Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
+    @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tjh=#{cardId}")
     List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);
+
+
+    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tjh} and tmh=#{tmh} ")
+    void deletedLtkjJcbgdByTjhandtmh(@Param("tjh") String tjh, @Param("tmh") String tmh);
+
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
index 2317308..ec4997e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -51,4 +51,10 @@
                                                   @Param("pagecount")int pagecount,
                                                   @Param("page")int page,
                                                   @Param("status")String status);
+
+
+
+    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and tmh=#{tmh}")
+    void  deletedLtkjJcsqdByTjhandtmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
+
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index ff61fb4..825f8da 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -390,4 +390,7 @@
 
     @Select("SELECT count(*) FROM tj_order WHERE tj_number = #{tjNum}")
     int getOrderCountByTjNum(String tjNum);
+
+    List<List<?>> getYxJcList(Map<String,Object> map);
+
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 5e0908c..05f88de 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -286,4 +286,7 @@
     List<TjOrderRemark> shoufeiyemianyishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
 
     List<TjOrderRemark> shoufeiyemianweishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
+
+    @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
+    List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
new file mode 100644
index 0000000..d23aafb
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdtgmdjgMapper.java
@@ -0,0 +1,14 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TjXdtgmdjgMapper extends BaseMapper<TjXdtgmdjg> {
+
+    @Delete("DELETE FROM tj_xdtgmdjg  WHERE tjh=#{tjNumber} and pro_id=#{proId}")
+    void deletedByTJhAndProId(@Param("tjNumber") String tjNumber, @Param("proId") String proId);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index 601dd80..1a8c57b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -95,4 +95,6 @@
     List<TjOrderRemark> shoufeiyemianyishoufei(String tjNumber,String jxbz);
 
     List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);
+
+    List<CsProVo> getYxJcXx(String tjNumber, String string);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 0967411..6dd31c5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -190,4 +190,8 @@
     Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime);
 
     int getOrderCountByTjNum(String tjh);
+
+    //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆)
+    Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
+                                   String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
index 0d2f330..7962e5e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java
@@ -15,11 +15,13 @@
 public interface LtkjExamJcbgdService extends IService<LtkjExamJcbgd> {
 
 
-    void  deletedLtkjJcbgdByTjhAndTmh(String tmh);
+    void deletedLtkjJcbgdByTjhAndTmh(String tmh);
 
     List<String> getJianJcBaoGaoDan(String cardId);
 
     List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
 
     List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId);
+
+    void deletedLtkjJcbgdByTjhandtmh(String cardId, String s);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
index 5c566d4..6f95c6f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java
@@ -28,4 +28,6 @@
     AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status);
 
     List<LtkjExamJcbgd> queryLtkjExamJcsqdByTjh(String tjh);
+
+    void deletedLtkjJcsqdByTjhandtmh(String cardId, String s);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
new file mode 100644
index 0000000..587932c
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjXdtgmdjgService.java
@@ -0,0 +1,8 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
+
+public interface TjXdtgmdjgService extends IService<TjXdtgmdjg> {
+    void deletedByTJhAndProId(String tjNumber, String proId);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
index 215f935..1351617 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java
@@ -44,4 +44,9 @@
     public List<LtkjExamJcbgd> getJianJcBaoGaoDanByTjh(String cardId) {
         return mapper.getJianJcBaoGaoDanByTjh(cardId);
     }
+
+    @Override
+    public void deletedLtkjJcbgdByTjhandtmh(String tjh, String tmh) {
+        mapper.deletedLtkjJcbgdByTjhandtmh(tjh, tmh);
+    }
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
index 9ad309e..0438b7f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java
@@ -60,6 +60,11 @@
     }
 
     @Override
+    public void deletedLtkjJcsqdByTjhandtmh(String tjh, String tmh) {
+        mapper.deletedLtkjJcsqdByTjhandtmh(tjh,tmh);
+    }
+
+    @Override
     public void saveLtkjExamJcsqd(String tjh) {
         mapper.saveLtkjExamJcsqd(tjh);
     }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 48cdf7e..a9a82d8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -193,4 +193,10 @@
         return mapper.shoufeiyemianweishoufei(tjNumber,jxbz);
     }
 
+    @Override
+    public List<CsProVo> getYxJcXx(String tjNumber,String ks) {
+        List<CsProVo> yxJcXx = mapper.getYxJcXx(tjNumber,ks);
+        return yxJcXx;
+    }
+
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index f2a47fa..f273af1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -453,4 +453,25 @@
     public int getOrderCountByTjNum(String tjNum) {
         return tjOrderMapper.getOrderCountByTjNum(tjNum);
     }
+
+    @Override
+    public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize,
+                                           String compId, String beginTime, String endTime, String tjname,String tcm,String deptId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("checkStatus",checkStatus);
+        map.put("page",page);
+        map.put("pageSize",pageSize);
+        map.put("tjNumber",tjNumber);
+        map.put("compId",compId);
+        map.put("tjname",tjname);
+        map.put("tcm",tcm);
+        map.put("beginTime",beginTime);
+        map.put("endTime",endTime);
+        map.put("ks",deptId);
+        List<List<?>> list = tjOrderMapper.getYxJcList(map);
+        Map<String,Object> map1=new HashMap<>();
+        map1.put("customers",list);
+        map1.put("total",map.get("total"));
+        return map1;
+    }
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
new file mode 100644
index 0000000..4a00d1b
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdtgmdjgServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjXdtgmdjg;
+import com.ltkj.hosp.mapper.TjXdtgmdjgMapper;
+import com.ltkj.hosp.service.TjXdtgmdjgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TjXdtgmdjgServiceImpl extends ServiceImpl<TjXdtgmdjgMapper, TjXdtgmdjg> implements TjXdtgmdjgService {
+
+    @Autowired
+    private TjXdtgmdjgMapper mapper;
+
+    @Override
+    public void deletedByTJhAndProId(String tjNumber, String proId) {
+        mapper.deletedByTJhAndProId(tjNumber,proId);
+    }
+}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index ec8e0e3..83725ea 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -411,4 +411,20 @@
               )}
     </select>
 
+    <select id="getYxJcList" parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
+        {call tj_xdtgmd_list(
+                #{checkStatus,mode=IN,jdbcType=INTEGER},
+                #{page,mode=IN,jdbcType=INTEGER},
+                #{pageSize,mode=IN,jdbcType=INTEGER},
+                #{tjNumber,mode=IN,jdbcType=VARCHAR},
+                #{compId,mode=IN,jdbcType=VARCHAR},
+                #{tjname,mode=IN,jdbcType=VARCHAR},
+                #{beginTime,mode=IN,jdbcType=VARCHAR},
+                #{endTime,mode=IN,jdbcType=VARCHAR},
+                #{tcm,mode=IN,jdbcType=VARCHAR},
+                #{ks,mode=IN,jdbcType=VARCHAR},
+                #{total,mode=OUT,jdbcType=INTEGER}
+              )}
+    </select>
+
 </mapper>
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml
index 39569af..a984abd 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml
@@ -5,231 +5,264 @@
 <mapper namespace="com.ltkj.hosp.mapper.TjProAdvicerulesMapper">
 
     <resultMap type="TjProAdvicerules" id="TjProAdvicerulesResult">
-            <result property="id" column="id"/>
-            <result property="bm" column="bm"/>
-            <result property="ks" column="ks"/>
-            <result property="jcxm" column="jcxm"/>
-            <result property="zyzd" column="zyzd"/>
-            <result property="jymc" column="jymc"/>
-            <result property="jynr" column="jynr"/>
-            <result property="fwz" column="fwz"/>
-            <result property="fwzxz" column="fwzxz"/>
-            <result property="fwzdz" column="fwzdz"/>
-            <result property="ycbz" column="ycbz"/>
-            <result property="sfjb" column="sfjb"/>
-            <result property="sfcjb" column="sfcjb"/>
-            <result property="sfmxb" column="sfmxb"/>
-            <result property="sfzdjb" column="sfzdjb"/>
-            <result property="createTime" column="create_time"/>
-            <result property="updateTime" column="update_time"/>
-            <result property="createBy" column="create_by"/>
-            <result property="updateBy" column="update_by"/>
-            <result property="deleted" column="deleted"/>
+        <result property="id" column="id"/>
+        <result property="bm" column="bm"/>
+        <result property="ks" column="ks"/>
+        <result property="jcxm" column="jcxm"/>
+        <result property="zyzd" column="zyzd"/>
+        <result property="jymc" column="jymc"/>
+        <result property="jynr" column="jynr"/>
+        <result property="fwz" column="fwz"/>
+        <result property="fwzxz" column="fwzxz"/>
+        <result property="fwzdz" column="fwzdz"/>
+        <result property="ycbz" column="ycbz"/>
+        <result property="sfjb" column="sfjb"/>
+        <result property="sfcjb" column="sfcjb"/>
+        <result property="sfmxb" column="sfmxb"/>
+        <result property="sfzdjb" column="sfzdjb"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="deleted" column="deleted"/>
+        <result property="xb" column="xb"/>
     </resultMap>
 
     <sql id="selectTjProAdvicerulesVo">
-        select id, bm, ks, jcxm, zyzd, jymc, jynr, fwz, fwzxz, fwzdz, ycbz, sfjb, sfcjb, sfmxb, sfzdjb, create_time, update_time, create_by, update_by, deleted
+        select id,
+               bm,
+               ks,
+               jcxm,
+               zyzd,
+               jymc,
+               jynr,
+               fwz,
+               fwzxz,
+               fwzdz,
+               ycbz,
+               sfjb,
+               sfcjb,
+               sfmxb,
+               sfzdjb,
+               create_time,
+               update_time,
+               create_by,
+               update_by,
+               deleted,
+               xb
         from tj_pro_advicerules
     </sql>
 
     <select id="selectTjProAdvicerulesList" parameterType="TjProAdvicerules" resultMap="TjProAdvicerulesResult">
         <include refid="selectTjProAdvicerulesVo"/>
         <where>
-                        <if test="bm != null  and bm != ''">
-                            and bm like concat('%', #{bm}, '%')
-                        </if>
-                        <if test="ks != null  and ks != ''">
-                            and ks like concat('%', #{ks}, '%')
-                        </if>
-                        <if test="jcxm != null  and jcxm != ''">
-                            and jcxm like concat('%', #{jcxm}, '%')
-                        </if>
-                        <if test="zyzd != null  and zyzd != ''">
-                            and zyzd like concat('%', #{zyzd}, '%')
-                        </if>
-                        <if test="jymc != null  and jymc != ''">
-                            and jymc like concat('%', #{jymc}, '%')
-                        </if>
-                        <if test="jynr != null  and jynr != ''">
-                            and jynr like concat('%', #{jynr}, '%')
-                        </if>
-                        <if test="sfjb != null  and sfjb != ''">
-                            and sfjb = #{sfjb}
-                        </if>
-                        <if test="sfcjb != null  and sfcjb != ''">
-                            and sfcjb = #{sfcjb}
-                        </if>
-                        <if test="sfmxb != null  and sfmxb != ''">
-                            and sfmxb = #{sfmxb}
-                        </if>
-                        <if test="sfzdjb != null  and sfzdjb != ''">
-                            and sfzdjb = #{sfzdjb}
-                        </if>
+            <if test="bm != null  and bm != ''">
+                and bm like concat('%', #{bm}, '%')
+            </if>
+            <if test="ks != null  and ks != ''">
+                and ks like concat('%', #{ks}, '%')
+            </if>
+            <if test="jcxm != null  and jcxm != ''">
+                and jcxm like concat('%', #{jcxm}, '%')
+            </if>
+            <if test="zyzd != null  and zyzd != ''">
+                and zyzd like concat('%', #{zyzd}, '%')
+            </if>
+            <if test="jymc != null  and jymc != ''">
+                and jymc like concat('%', #{jymc}, '%')
+            </if>
+            <if test="jynr != null  and jynr != ''">
+                and jynr like concat('%', #{jynr}, '%')
+            </if>
+            <if test="sfjb != null  and sfjb != ''">
+                and sfjb = #{sfjb}
+            </if>
+            <if test="sfcjb != null  and sfcjb != ''">
+                and sfcjb = #{sfcjb}
+            </if>
+            <if test="sfmxb != null  and sfmxb != ''">
+                and sfmxb = #{sfmxb}
+            </if>
+            <if test="sfzdjb != null  and sfzdjb != ''">
+                and sfzdjb = #{sfzdjb}
+            </if>
+            <if test="xb != null  and xb != ''">
+                and xb = #{xb}
+            </if>
         </where>
         ORDER BY ks
     </select>
 
     <select id="selectTjProAdvicerulesById" parameterType="Long"
             resultMap="TjProAdvicerulesResult">
-            <include refid="selectTjProAdvicerulesVo"/>
-            where id = #{id}
+        <include refid="selectTjProAdvicerulesVo"/>
+        where id = #{id}
     </select>
 
     <insert id="insertTjProAdvicerules" parameterType="TjProAdvicerules">
         insert into tj_pro_advicerules
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="bm != null">bm,
-                    </if>
-                    <if test="ks != null">ks,
-                    </if>
-                    <if test="jcxm != null">jcxm,
-                    </if>
-                    <if test="zyzd != null">zyzd,
-                    </if>
-                    <if test="jymc != null">jymc,
-                    </if>
-                    <if test="jynr != null">jynr,
-                    </if>
-                    <if test="fwz != null">fwz,
-                    </if>
-                    <if test="fwzxz != null">fwzxz,
-                    </if>
-                    <if test="fwzdz != null">fwzdz,
-                    </if>
-                    <if test="ycbz != null">ycbz,
-                    </if>
-                    <if test="sfjb != null">sfjb,
-                    </if>
-                    <if test="sfcjb != null">sfcjb,
-                    </if>
-                    <if test="sfmxb != null">sfmxb,
-                    </if>
-                    <if test="sfzdjb != null">sfzdjb,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
-                    <if test="deleted != null">deleted,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="bm != null">bm,
+            </if>
+            <if test="ks != null">ks,
+            </if>
+            <if test="jcxm != null">jcxm,
+            </if>
+            <if test="zyzd != null">zyzd,
+            </if>
+            <if test="jymc != null">jymc,
+            </if>
+            <if test="jynr != null">jynr,
+            </if>
+            <if test="fwz != null">fwz,
+            </if>
+            <if test="fwzxz != null">fwzxz,
+            </if>
+            <if test="fwzdz != null">fwzdz,
+            </if>
+            <if test="ycbz != null">ycbz,
+            </if>
+            <if test="sfjb != null">sfjb,
+            </if>
+            <if test="sfcjb != null">sfcjb,
+            </if>
+            <if test="sfmxb != null">sfmxb,
+            </if>
+            <if test="sfzdjb != null">sfzdjb,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="deleted != null">deleted,
+            </if>
+
+            <if test="xb != null">xb,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="bm != null">#{bm},
-                    </if>
-                    <if test="ks != null">#{ks},
-                    </if>
-                    <if test="jcxm != null">#{jcxm},
-                    </if>
-                    <if test="zyzd != null">#{zyzd},
-                    </if>
-                    <if test="jymc != null">#{jymc},
-                    </if>
-                    <if test="jynr != null">#{jynr},
-                    </if>
-                    <if test="fwz != null">#{fwz},
-                    </if>
-                    <if test="fwzxz != null">#{fwzxz},
-                    </if>
-                    <if test="fwzdz != null">#{fwzdz},
-                    </if>
-                    <if test="ycbz != null">#{ycbz},
-                    </if>
-                    <if test="sfjb != null">#{sfjb},
-                    </if>
-                    <if test="sfcjb != null">#{sfcjb},
-                    </if>
-                    <if test="sfmxb != null">#{sfmxb},
-                    </if>
-                    <if test="sfzdjb != null">#{sfzdjb},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="deleted != null">#{deleted},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="bm != null">#{bm},
+            </if>
+            <if test="ks != null">#{ks},
+            </if>
+            <if test="jcxm != null">#{jcxm},
+            </if>
+            <if test="zyzd != null">#{zyzd},
+            </if>
+            <if test="jymc != null">#{jymc},
+            </if>
+            <if test="jynr != null">#{jynr},
+            </if>
+            <if test="fwz != null">#{fwz},
+            </if>
+            <if test="fwzxz != null">#{fwzxz},
+            </if>
+            <if test="fwzdz != null">#{fwzdz},
+            </if>
+            <if test="ycbz != null">#{ycbz},
+            </if>
+            <if test="sfjb != null">#{sfjb},
+            </if>
+            <if test="sfcjb != null">#{sfcjb},
+            </if>
+            <if test="sfmxb != null">#{sfmxb},
+            </if>
+            <if test="sfzdjb != null">#{sfzdjb},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="deleted != null">#{deleted},
+            </if>
+            <if test="xb != null">#{xb},
+            </if>
         </trim>
     </insert>
 
     <update id="updateTjProAdvicerules" parameterType="TjProAdvicerules">
         update tj_pro_advicerules
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="bm != null">bm =
-                        #{bm},
-                    </if>
-                    <if test="ks != null">ks =
-                        #{ks},
-                    </if>
-                    <if test="jcxm != null">jcxm =
-                        #{jcxm},
-                    </if>
-                    <if test="zyzd != null">zyzd =
-                        #{zyzd},
-                    </if>
-                    <if test="jymc != null">jymc =
-                        #{jymc},
-                    </if>
-                    <if test="jynr != null">jynr =
-                        #{jynr},
-                    </if>
-                    <if test="fwz != null">fwz =
-                        #{fwz},
-                    </if>
-                    <if test="fwzxz != null">fwzxz =
-                        #{fwzxz},
-                    </if>
-                    <if test="fwzdz != null">fwzdz =
-                        #{fwzdz},
-                    </if>
-                    <if test="ycbz != null">ycbz =
-                        #{ycbz},
-                    </if>
-                    <if test="sfjb != null">sfjb =
-                        #{sfjb},
-                    </if>
-                    <if test="sfcjb != null">sfcjb =
-                        #{sfcjb},
-                    </if>
-                    <if test="sfmxb != null">sfmxb =
-                        #{sfmxb},
-                    </if>
-                    <if test="sfzdjb != null">sfzdjb =
-                        #{sfzdjb},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
-                    <if test="deleted != null">deleted =
-                        #{deleted},
-                    </if>
+            <if test="bm != null">bm =
+                #{bm},
+            </if>
+            <if test="ks != null">ks =
+                #{ks},
+            </if>
+            <if test="jcxm != null">jcxm =
+                #{jcxm},
+            </if>
+            <if test="zyzd != null">zyzd =
+                #{zyzd},
+            </if>
+            <if test="jymc != null">jymc =
+                #{jymc},
+            </if>
+            <if test="jynr != null">jynr =
+                #{jynr},
+            </if>
+            <if test="fwz != null">fwz =
+                #{fwz},
+            </if>
+            <if test="fwzxz != null">fwzxz =
+                #{fwzxz},
+            </if>
+            <if test="fwzdz != null">fwzdz =
+                #{fwzdz},
+            </if>
+            <if test="ycbz != null">ycbz =
+                #{ycbz},
+            </if>
+            <if test="sfjb != null">sfjb =
+                #{sfjb},
+            </if>
+            <if test="sfcjb != null">sfcjb =
+                #{sfcjb},
+            </if>
+            <if test="sfmxb != null">sfmxb =
+                #{sfmxb},
+            </if>
+            <if test="sfzdjb != null">sfzdjb =
+                #{sfzdjb},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="deleted != null">deleted =
+                #{deleted},
+            </if>
+            <if test="xb != null">xb =
+                #{xb},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteTjProAdvicerulesById" parameterType="Long">
         delete
-        from tj_pro_advicerules where id = #{id}
+        from tj_pro_advicerules
+        where id = #{id}
     </delete>
 
     <delete id="deleteTjProAdvicerulesByIds" parameterType="String">

--
Gitblit v1.8.0