修改名称

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -3,7 +3,6 @@ package thyyxxk.webserver.dao.his.zhuyuanyisheng;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.*;
-import org.springframework.web.bind.annotation.RequestParam;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
 import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
@@ -18,7 +17,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -228,7 +226,7 @@ public interface YiZhuLuRuDao {
             "zy_order_zk b with (NOLOCK) on (a.act_order_no = b.act_order_no) left join " +
             "yz_act_record_kss kss on (a.act_order_no = kss.act_order_no) " +
             " ${ew.customSqlSegment} ")
-    List<XinZhenYzActOrder> huoQuYiZhuShuJu(@Param(Constants.WRAPPER) Wrapper<?> wq);
+    List<XinZhenYzActOrder> selectOrderNo(@Param(Constants.WRAPPER) Wrapper<?> wq);
 
     @Select("select act_order_no, " +
             "rtrim(status_flag) status_flag," +
@@ -945,30 +943,8 @@ public interface YiZhuLuRuDao {
             " from zy_actpatient with (NOLOCK) " +
             "where inpatient_no = #{patNo} " +
             "  and admiss_times = #{times} ")
-    XinZhenYiZhu huoQuHuanZheXinXi(@Param("patNo") String patNo,
-                                   @Param("times") Integer times);
-
-
-    @Delete("<script>" +
-            "delete yz_act_record_kss " +
-            "where act_order_no in " +
-            "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
-            "#{item.actOrderNo}" +
-            "</foreach>" +
-            "</script>")
-    void shanChuYuanKuangJunYaoWu(List<YzActRecordKss> list);
-
-    @Insert("<script>" +
-            "insert into yz_act_record_kss (act_order_no, charge_code, input_id, inpatient_no, admiss_times, yyfs, ssqk, yysj) " +
-            "values " +
-            "<foreach collection='list' item='item' separator=','>" +
-            "(#{item.actOrderNo},#{item.chargeCode},#{inputId},#{patNo},#{times},#{item.yyfs},#{item.ssqk},#{item.yysj})" +
-            "</foreach>" +
-            "</script>")
-    void chaRuKuangJunYaoWuXinXi(@Param("patNo") String patNo,
-                                 @Param("times") Integer times,
-                                 @Param("inputId") String inputId,
-                                 @Param("list") List<YzActRecordKss> list);
+    XinZhenYiZhu queryPatientInfo(@Param("patNo") String patNo,
+                                  @Param("times") Integer times);
 
 
     @Insert("<script>" +

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/YshYjReq.java

@@ -207,11 +207,13 @@ public class YshYjReq implements Serializable {
     private String ybSelfFlag;
 
     public String getReceiveFlagName() {
-        if (this.receiveFlag == null) return "";
-        if (this.receiveFlag.equals("1")) {
+        if (receiveFlag == null) {
+            return "";
+        }
+        if ("1".equals(receiveFlag)) {
+            return "申请医技";
+        } else if ("2".equals(receiveFlag)) {
             return "医技接受";
-        } else if (this.receiveFlag.equals("2")) {
-            return "结果已返回";
         }
         return "";
     }

src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -6,10 +6,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.sidicts.Insutype;
 import thyyxxk.webserver.constants.sidicts.MedType;
 import thyyxxk.webserver.dao.his.inpatient.PatientDao;
 import thyyxxk.webserver.dao.his.inpatient.Routines;
@@ -23,7 +21,6 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.XinZhenYiZhu;
 import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.*;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -98,7 +95,7 @@ public class PatientService {
             // 医保百分比
             data.setYb(DecimalUtil.getPercent(Double.parseDouble(feiYongZhanBi.getChargeYb()), Double.parseDouble(feiYongZhanBi.getTotalCharge())));
         }
-        XinZhenYiZhu xinZhenYiZhu = yiZhuLuRuDao.huoQuHuanZheXinXi(data.getInpatientNo(), data.getAdmissTimes());
+        XinZhenYiZhu xinZhenYiZhu = yiZhuLuRuDao.queryPatientInfo(data.getInpatientNo(), data.getAdmissTimes());
         if (xinZhenYiZhu != null) {
             // 是否出纳
             data.setTimesBilled(xinZhenYiZhu.getTimesBilled());

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuServer.java

@@ -153,7 +153,7 @@ public class CaoYaoYiZhuServer {
             sum = sum.add(item.getQuantity().multiply(item.getRetprice()));
             yaoPingCode.add(item.getChargeCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
         }
-        XinZhenYiZhu patInfo = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu patInfo = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         Map<String, XinZhenYzActOrder> drug = yiZhuLuRuServer.getDrugInformation(yaoPingCode, patInfo.getZkWard());
         // 错误信息
         Map<String, List<String>> errorMap = new HashMap<>();
@@ -194,7 +194,7 @@ public class CaoYaoYiZhuServer {
         // 设置代煎费
         param.setOrderJeDj(dao.huoQuDaiJianFei());
         param.setPageNo(publicServer.getTheDrugListNo());
-        XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         param.setOrderNo(publicServer.getActOrderNo());
 
         // 生成草药和医嘱

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/HuiZhenShenQingService.java

@@ -90,7 +90,7 @@ public class HuiZhenShenQingService {
         // 生成会诊和医嘱
         getThis().generateConsultation(param);
         log.info("插入数据：{}", JSON.toJSONString(param));
-        XinZhenYiZhu patientInfo = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu patientInfo = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         UserInfo userInfo = redisLikeService.getUserInfoByToken();
 
         String msg = String.format("患者：【%s】，住院号：【%s】，<br />请%s进行院内会诊。<br />会诊目的：<span style='color: red '>【%s】</span><br />申请人：【%s】，申请科室：【%s】",

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -27,7 +27,6 @@ import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.*;
 
 import java.lang.reflect.Field;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -393,7 +392,7 @@ public class JianYanJianChaShenQingServer {
         if (ListUtil.isBlank(param.getList())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择需要保存的数据。");
         }
-        XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         publicServer.huanZheJieSuan(param.getInpatientNo(), param.getAdmissTimes());
         List<String> xm = new ArrayList<>();
         int index = 1;
@@ -527,8 +526,8 @@ public class JianYanJianChaShenQingServer {
         if (yj == null) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到该数据的具体信息，已经被删除了。");
         }
-        if (yj.getReceiveFlag().trim().equals("2")) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "结果已返回，无法删除。");
+        if (!"1".equals(yj.getReceiveFlag().trim())) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "当前不是申请状态无法删除，无法删除。");
         }
         dao.shanChuJianYanJianCha(reqNo, patNo, times);
         dao.shanChuYiZhu(yj.getActOrderNo());

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/ShouShuShenQingServer.java

@@ -6,8 +6,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dtflys.forest.annotation.LogHandler;
-import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,8 +24,6 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.XinZhenYiZhu;
 import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.utils.*;
 
-import javax.print.DocFlavor;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -166,7 +162,7 @@ public class ShouShuShenQingServer {
                     "手术时间：<span style='color:#409eff'>【%tF %<tT】</span><br>", item.getOpName(), item.getOpDatetime()));
         }
         log.info("上传数据：{}", JSON.toJSONString(param));
-        XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         // 生成手术
         getThis().generativeSurgery(param, userCode, shenChengYiZhu, huanZheXinXi);
         publicServer.faSongXiaoXi(huanZheXinXi, content, "新增手术", TokenUtil.getTokenUserId());

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -136,7 +136,7 @@ public class YiZhuLuRuServer {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("a.inpatient_no", param.getPatNo()).eq("a.admiss_times", param.getTimes());
         qw.orderByAsc("a.order_time");
-        List<XinZhenYzActOrder> yiZhuList = dao.huoQuYiZhuShuJu(qw);
+        List<XinZhenYzActOrder> yiZhuList = dao.selectOrderNo(qw);
         // 还有那些没有被匹配的子级医嘱
         Map<BigDecimal, XinZhenYzActOrder> wuFuJiYiZhu = yiZhuList.stream().collect(Collectors.toMap(XinZhenYzActOrder::getActOrderNo, a -> a, (k1, k2) -> k1));
 
@@ -279,7 +279,7 @@ public class YiZhuLuRuServer {
                 // 排除出院带药的医嘱
                 .ne("isnull(a.self_buy,'0')", "4")
                 .orderByAsc("a.act_order_no");
-        param.setList(dao.huoQuYiZhuShuJu(qw));
+        param.setList(dao.selectOrderNo(qw));
         List<XinZhenYzActOrder> yiZhuList = param.getList();
         if (ListUtil.isBlank(yiZhuList)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有需要确认的医嘱.");
@@ -302,7 +302,7 @@ public class YiZhuLuRuServer {
         String userCode = TokenUtil.getTokenUserId();
         // 获取医生开药品的权限
         Integer doctorLevel = dao.huoQuYiShenDengJi(userCode);
-        XinZhenYiZhu patInfo = dao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu patInfo = dao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, patInfo.getZkWard());
         Map<String, List<XinZhenYzActOrder>> project = getProjectInformation(xiangMuCode);
 
@@ -437,7 +437,7 @@ public class YiZhuLuRuServer {
         }
         // 获取医生开药品的权限
         Integer doctorLevel = dao.huoQuYiShenDengJi(userCode);
-        XinZhenYiZhu huanZheXinXi = dao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu huanZheXinXi = dao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         XinZhenYzActOrder data = param.getData();
         if (ITEM.equals(data.getSerial().trim())) {
             data.setGroupNo("00");
@@ -520,7 +520,7 @@ public class YiZhuLuRuServer {
             fatherAndSonDoctorSAdvice.put(item.getId(), item);
             item.setActOrderNo(publicServer.getActOrderNo());
         });
-        XinZhenYiZhu huanZheXinXi = dao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
+        XinZhenYiZhu huanZheXinXi = dao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         // 把模板的数据插入到医嘱
         getThis().templateInsertToOrder(param, fatherAndSonDoctorSAdvice, huanZheXinXi);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "插入模板数据成功。");
@@ -1527,8 +1527,8 @@ public class YiZhuLuRuServer {
                 .eq("a.status_flag", "1")
                 .eq("a.enter_oper", TokenUtil.getTokenUserId())
                 .eq("isnull(a.self_buy,'0')", "4");
-        XinZhenYiZhu patInfo = dao.huoQuHuanZheXinXi(patNo, times);
-        patInfo.setList(dao.huoQuYiZhuShuJu(qw));
+        XinZhenYiZhu patInfo = dao.queryPatientInfo(patNo, times);
+        patInfo.setList(dao.selectOrderNo(qw));
         if (dao.obtainTheNumberOfDischargedDrugs(patNo, times) > 出院带药限制数量) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "出院带药医嘱不得超过 4 种，且不得超过 15 天。");
         }
@@ -1587,7 +1587,7 @@ public class YiZhuLuRuServer {
             for (int i = 0; i < takeTheMedicineList.size(); i++) {
                 pageNoList.add(publicServer.getTheDrugListNo());
             }
-            sendAMessageToTheNurse(patInfo, userCode, dao.huoQuHuanZheXinXi(patNo, times), "出院带药");
+            sendAMessageToTheNurse(patInfo, userCode, dao.queryPatientInfo(patNo, times), "出院带药");
             return getThis().getMapResultVo(patInfo, userCode, takeTheMedicineList, pageNoList);
         } else {
             return ResultVoUtil.fail(ExceptionEnum.ERROR_MESSAGE, "请修改有错误的医嘱。", check);