去除CA签名

src/main/java/thyyxxk/webserver/dao/his/inpatient/nursemodule/PrintInfusionCardDao.java

@@ -221,17 +221,15 @@ public interface PrintInfusionCardDao {
             "where act_order_no=#{orderNo} or parent_no=#{orderNo}")
     int updateOrderExecId(String staff, String orderNo, Date execTime);
 
-    @Update("update yz_act_occ set execute_staff=#{staff},execute_time=#{execTime}," +
-            "execute_ca_sign_id=#{caId} " +
+    @Update("update yz_act_occ set execute_staff=#{staff},execute_time=#{execTime} " +
             "where inpatient_no=#{patNo} and occ_time>=#{occTime} and occ_time<#{occTime2} and " +
             "(act_order_no=#{actOrderNo} or parent_no=#{actOrderNo})")
-    int updateExecutor(String patNo, String actOrderNo, Date execTime, Date occTime, Date occTime2, String staff, String caId);
+    int updateExecutor(String patNo, String actOrderNo, Date execTime, Date occTime, Date occTime2, String staff);
 
-    @Update("update yz_act_occ set end_executor=#{staff},end_execute_time=getdate(), " +
-            "end_execute_ca_sign_id=#{caId} " +
+    @Update("update yz_act_occ set end_executor=#{staff},end_execute_time=getdate() " +
             "where inpatient_no=#{patNo} and occ_time>=#{occTime} and occ_time<#{occTime2} and " +
             "(act_order_no=#{actOrderNo} or parent_no=#{actOrderNo})")
-    int updateEndExecute(String patNo, String actOrderNo, Date occTime, Date occTime2, String staff, String caId);
+    int updateEndExecute(String patNo, String actOrderNo, Date occTime, Date occTime2, String staff);
 
     @Update("update yz_act_occ set prepare_staff=#{staff},prepare_time=getdate() " +
             "where inpatient_no=#{patNo} and occ_time>=#{occTime} and occ_time<#{occTime2} and " +

src/main/java/thyyxxk/webserver/service/inpatient/nursemodule/PrintInfusionCardService.java

@@ -255,14 +255,7 @@ public class PrintInfusionCardService {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有找到医嘱用药内容！");
         }
         int checkedCount = 0;
-        StringBuilder caMsbBuilder = new StringBuilder();
-        caMsbBuilder
-                .append("为患者【")
-                .append(drugs.get(0).getInpatientName().trim())
-                .append(scanType == 1 ? "】执行输液：" : "】结束输液：");
-        for (int i = 0; i < drugs.size(); i++) {
-            YzActOcc occ = drugs.get(i);
-
+        for (YzActOcc occ : drugs) {
             if (scanType == 1) {
                 if (StringUtil.notBlank(occ.getExecuteStaff()) && null != occ.getExecuteTime()) {
                     String executeTime = DateUtil.formatDatetime(occ.getExecuteTime());
@@ -288,25 +281,12 @@ public class PrintInfusionCardService {
             if (mapQuan.compareTo(occ.getDrugQuan()) != 0) {
                 return ResultVoUtil.fail(ExceptionEnum.SLIGHTLY_ERROR, "用药与医嘱不匹配，请检查！");
             }
-            caMsbBuilder.append(occ.getOccName().trim()).append(" x ").append(occ.getDrugQuan());
-            if (i == drugs.size() - 1) {
-                caMsbBuilder.append("。");
-            } else {
-                caMsbBuilder.append("；");
-            }
             checkedCount++;
             drugMap.remove(occ.getChargeCode());
         }
         if (checkedCount == drugs.size() && drugMap.isEmpty()) {
             String staff = TokenUtil.getInstance().getTokenUserId();
 
-            CaSignClass.Send caParams = new CaSignClass.Send();
-            caParams.setId(staff);
-            caParams.setMsg(caMsbBuilder.toString());
-            caParams.setDesc(scanType == 1 ? "执行输液医嘱。" : "结束输液。");
-            log.info("执行输液CA签名入参：{}", caParams);
-            CaReturn.CaSignReturn caRes = caService.sendByCode(caParams);
-            log.info("执行输液CA签名返回：{}", caRes);
             if (scanType == 1) {
                 Date execTime = new Date();
                 String freq = dao.getOrderFreq(actOrderNo);
@@ -316,12 +296,12 @@ public class PrintInfusionCardService {
                         return ResultVoUtil.fail(ExceptionEnum.SLIGHTLY_ERROR, "数据库出错，核对执行失败！");
                     }
                 }
-                int updatedRows = dao.updateExecutor(patNo, actOrderNo, execTime, occTime, occTime2, staff, caRes.getId());
+                int updatedRows = dao.updateExecutor(patNo, actOrderNo, execTime, occTime, occTime2, staff);
                 if (updatedRows > 0) {
                     return ResultVoUtil.success("核对执行成功。");
                 }
             } else {
-                int updatedRows = dao.updateEndExecute(patNo, actOrderNo, occTime, occTime2, staff, caRes.getId());
+                int updatedRows = dao.updateEndExecute(patNo, actOrderNo, occTime, occTime2, staff);
                 if (updatedRows > 0) {
                     return ResultVoUtil.success("结束执行成功。");
                 }