优化检查检验项目的编码生成机制

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzOrderItemMapper.java

@@ -8,6 +8,13 @@ import org.apache.ibatis.annotations.Update;
 
 public interface YzOrderItemMapper {
 
+    /**
+     * 查询最后一个检查住院医嘱码
+     *
+     * @return
+     */
+    @Select("select top 1 rtrim(order_code) order_code  from yz_order_item  WITH(NOLOCK) order by order_code desc ")
+    String selectLastZyOrderCode();
 
     /**根据单个医嘱编码查询医嘱
      * @param orderCode

src/main/java/cn/hnthyy/thmz/mapper/his/zd/JcZdItemMapper.java

@@ -121,13 +121,6 @@ public interface JcZdItemMapper {
     @Select("select top 1  rtrim(code) code from jc_zd_item WITH(NOLOCK) order by code desc ")
     String selectLastCode();
 
-    /**
-     * 查询最后一个检查住院医嘱码
-     *
-     * @return
-     */
-    @Select("select top 1 rtrim(zy_order_code) zy_order_code  from jc_zd_item  WITH(NOLOCK) order by zy_order_code desc ")
-    String selectLastZyOrderCode();
 
 
     /**

src/main/java/cn/hnthyy/thmz/mapper/his/zd/JyZdItemMapper.java

@@ -152,14 +152,6 @@ public interface JyZdItemMapper {
     @Select("select top 1 rtrim(code) code from jy_zd_item WITH(NOLOCK) order by code desc ")
     String selectLastCode();
 
-    /**
-     * 查询最后一个检验住院医嘱码
-     *
-     * @return
-     */
-    @Select("select top 1 rtrim(zy_order_code) zy_order_code from jy_zd_item WITH(NOLOCK) order by zy_order_code desc ")
-    String selectLastZyOrderCode();
-
 
     /**
      * 查询最后一个检验门诊医嘱码

src/main/java/cn/hnthyy/thmz/service/impl/his/zd/JcZdItemServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hnthyy.thmz.entity.his.yz.YzOrderItem;
 import cn.hnthyy.thmz.entity.his.zd.JcZdItem;
 import cn.hnthyy.thmz.mapper.his.yz.YzOrderItemMapper;
 import cn.hnthyy.thmz.mapper.his.zd.JcZdItemMapper;
+import cn.hnthyy.thmz.mapper.his.zd.JyZdItemMapper;
 import cn.hnthyy.thmz.service.his.zd.JcZdItemService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,9 @@ public class JcZdItemServiceImpl implements JcZdItemService {
     private JcZdItemMapper jcZdItemMapper;
     @SuppressWarnings("all")
     @Autowired
+    private JyZdItemMapper jyZdItemMapper;
+    @SuppressWarnings("all")
+    @Autowired
     private YzOrderItemMapper yzOrderItemMapper;
     @Override
     public JcZdItem queryJcZdItemByCode(String code) {
@@ -53,18 +57,26 @@ public class JcZdItemServiceImpl implements JcZdItemService {
         }
         if(StringUtils.isBlank(jcZdItem.getCode())){
             String lastCode=jcZdItemMapper.selectLastCode();
+            String lastJyCode=jyZdItemMapper.selectLastCode();
+            if(Integer.parseInt(lastJyCode)>Integer.parseInt(lastCode)){
+                lastCode=lastJyCode;
+            }
             String newCode= SignUtil.getNewCoder(lastCode);
             while (newCode.length()<6){
                 newCode="0"+newCode;
             }
             jcZdItem.setCode(newCode);
-            String lastZyOrderCode=jcZdItemMapper.selectLastZyOrderCode();
+            String lastZyOrderCode=yzOrderItemMapper.selectLastZyOrderCode();
             String newZyCode= SignUtil.getNewCoder(lastZyOrderCode);
             while (newZyCode.length()<5){
                 newZyCode="0"+newZyCode;
             }
             jcZdItem.setZyOrderCode(newZyCode);
             String lastMzCode=jcZdItemMapper.selectLastMzCode();
+            String lastJyMzCode=jyZdItemMapper.selectLastMzCode();
+            if(Integer.parseInt(lastJyMzCode)>Integer.parseInt(lastMzCode)){
+                lastMzCode=lastJyMzCode;
+            }
             String newMzCode=SignUtil.getNewCoder(lastMzCode);
             while (newZyCode.length()<4){
                 newZyCode="0"+newZyCode;

src/main/java/cn/hnthyy/thmz/service/impl/his/zd/JyZdItemServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hnthyy.thmz.Utils.SignUtil;
 import cn.hnthyy.thmz.entity.his.yz.YzOrderItem;
 import cn.hnthyy.thmz.entity.his.zd.JyZdItem;
 import cn.hnthyy.thmz.mapper.his.yz.YzOrderItemMapper;
+import cn.hnthyy.thmz.mapper.his.zd.JcZdItemMapper;
 import cn.hnthyy.thmz.mapper.his.zd.JyZdItemMapper;
 import cn.hnthyy.thmz.service.his.zd.JyZdItemService;
 import org.apache.commons.lang3.StringUtils;
@@ -17,6 +18,9 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 @Service
 public class JyZdItemServiceImpl implements JyZdItemService {
+    @SuppressWarnings("all")
+    @Autowired
+    private JcZdItemMapper jcZdItemMapper;
     @SuppressWarnings("all")
     @Autowired
     private JyZdItemMapper jyZdItemMapper;
@@ -57,19 +61,27 @@ public class JyZdItemServiceImpl implements JyZdItemService {
             jyZdItem.setWbCode(PyWbUtil.getWBCode(jyZdItem.getName()));
         }
         if(StringUtils.isBlank(jyZdItem.getCode())){
-            String lastCode=jyZdItemMapper.selectLastCode();
+            String lastCode=jcZdItemMapper.selectLastCode();
+            String lastJyCode=jyZdItemMapper.selectLastCode();
+            if(Integer.parseInt(lastJyCode)>Integer.parseInt(lastCode)){
+                lastCode=lastJyCode;
+            }
             String newCode= SignUtil.getNewCoder(lastCode);
             while (newCode.length()<6){
                 newCode="0"+newCode;
             }
             jyZdItem.setCode(newCode);
-            String lastZyOrderCode=jyZdItemMapper.selectLastZyOrderCode();
+            String lastZyOrderCode=yzOrderItemMapper.selectLastZyOrderCode();
             String newZyCode= SignUtil.getNewCoder(lastZyOrderCode);
             while (newZyCode.length()<5){
                 newZyCode="0"+newZyCode;
             }
             jyZdItem.setZyOrderCode(newZyCode);
-            String lastMzCode=jyZdItemMapper.selectLastMzCode();
+            String lastMzCode=jcZdItemMapper.selectLastMzCode();
+            String lastJyMzCode=jyZdItemMapper.selectLastMzCode();
+            if(Integer.parseInt(lastJyMzCode)>Integer.parseInt(lastMzCode)){
+                lastMzCode=lastJyMzCode;
+            }
             String newMzCode=SignUtil.getNewCoder(lastMzCode);
             while (newZyCode.length()<4){
                 newZyCode="0"+newZyCode;