合理用药

src/main/java/thyyxxk/webserver/dao/his/heliyongyao/RationalUseDao.java

@@ -18,18 +18,27 @@ import java.util.Map;
 @Mapper
 public interface RationalUseDao {
 
-    @Select("select          dept_code, " +
+    @Select("select          dept_code  , " +
             "    dept_name = (select rtrim(name) from zd_unit_code where zd_unit_code.code = dept_code), " +
             "                code, " +
             "                rtrim(name)     name, " +
             "                emp_tit_code as type, " +
             "    type_name = (select rtrim(name) from zd_emp_title where zd_emp_title.code = emp_tit_code) " +
             "from a_employee_mi " +
-            "where code = #{code}")
+            "where code = #{code}  ")
     Map<String, String> yiShenXinXi(String code);
 
 
-    @Select("")
+    @Select("select pati_id = rtrim(a.inpatient_no) + '_' + cast(admiss_times as varchar), " +
+            "                 rtrim(a.name) name, " +
+            "       birth=(convert(varchar(10), birth_date, 21)), " +
+            "                 a.sex, " +
+            "                 social_no as  id_card " +
+            "from zy_actpatient a, " +
+            "     a_patient_mi b " +
+            "where a.inpatient_no = b.inpatient_no " +
+            "  and a.inpatient_no = #{patNo} " +
+            "  and a.admiss_times = #{times}")
     RationalUsePatient huanZheXinXi(@Param("patNo") String patNo,
                                     @Param("times") Integer times);
 

src/main/java/thyyxxk/webserver/entity/heliyongyao/RationalUseDetails.java

@@ -67,7 +67,7 @@ public class RationalUseDetails {
     /**
      * 患者信息
      */
-    private RationalUsePatient patient;
+    private String patient;
 
     /**
      * 处方药数据

src/main/java/thyyxxk/webserver/service/heliyongyao/RationalUseServer.java

@@ -13,10 +13,7 @@ import thyyxxk.webserver.entity.heliyongyao.RationalUsePatient;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.XinZhenYiZhu;
 import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.service.externalhttp.RationalUseSrvc;
-import thyyxxk.webserver.utils.DateUtil;
-import thyyxxk.webserver.utils.JsonXmlUtils;
-import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.TokenUtil;
+import thyyxxk.webserver.utils.*;
 
 import java.util.Date;
 import java.util.Map;
@@ -49,16 +46,18 @@ public class RationalUseServer {
         log.info("数据：{}", JSON.toJSONString(param));
         String userCode = TokenUtil.getTokenUserId().equals("99999") ? param.getUserCode() : TokenUtil.getTokenUserId();
         yiShenXinXi(userCode);
-
+        yaoPinXinXi(param.getInpatientNo(), param.getAdmissTimes());
         return ResultVoUtil.success();
     }
 
     public String yiShenXinXi(String code) {
         Map<String, String> yiShenXinXi = dao.yiShenXinXi(code);
+        if (yiShenXinXi == null || yiShenXinXi.isEmpty()) {
+            return "";
+        }
         RationalUseBase base = new RationalUseBase();
         base.setDept_code(yiShenXinXi.get("dept_code"));
         base.setDept_name(yiShenXinXi.get("dept_name"));
-
         // 放入医生信息
         RationalUseDoct doct = new RationalUseDoct();
         doct.setName(yiShenXinXi.get("name"));
@@ -68,24 +67,35 @@ public class RationalUseServer {
         base.setDoct(doct);
         // json 转成 xml
         String json = JsonXmlUtils.json2Xml(JSON.toJSONString(base));
-
         log.info("医生数据：{}", "<base_xml>" + json + "</base_xml>");
-
         return json;
     }
 
-    public String huanZheXinXi(String patNo, Integer times) {
+    public String yaoPinXinXi(String patNo, Integer times) {
         XinZhenYiZhu patient1 = yiZhuLuRuDao.huoQuHuanZheXinXi(patNo, times);
-
         RationalUseDetails details = new RationalUseDetails();
+        // HIS系统时间
         details.setHis_time(DateUtil.formatDatetime(new Date()));
+        // 就诊号
         details.setTreat_code(patient1.getInpatientNo() + patient1.getAdmissTimes() + DateUtil.formatDatetime(new Date(), "YYYYMMDD"));
+        // 是否过渡重复分析
         details.setIs_repeat("0");
+        // 床位号
         details.setBed_no(patient1.getBedNo());
 
         RationalUsePatient patient = new RationalUsePatient();
+        try {
+            EntityCopy.Copy(dao.huanZheXinXi(patNo, times), patient);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // 患者ID
+        patient.setPati_id(patNo);
+        // 是否婴幼儿
         patient.setIs_infant(String.valueOf(publicServer.getInfantFlag(patient1.getInpatientNo())));
-
+        String patientJson = JsonXmlUtils.json2Xml(JSON.toJSONString(patient, JsonXmlUtils.filter));
+        log.info("患者数据：{}", patientJson);
+        details.setPatient(patientJson);
 
         return "";
     }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -153,11 +153,9 @@ public class SetlListUpldService {
      */
     public ResultVo<UpldCollection> getUploadInfo(String patNo, Integer times, Integer ledgerSn) throws Exception {
         boolean shiFouQianShouBingAn = dao.shiFouQianShou(patNo, times);
-        if (shiFouQianShouBingAn) {
+        if (!shiFouQianShouBingAn) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该病案没有签收，请病案室签收后上传。");
         }
-        log.info("是否签收：{}", shiFouQianShouBingAn);
-
         Integer flag = dao.setlModifyReqAuditFlag(patNo, times);
         flag = flag == null ? 0 : flag;
         SetlinfoUpld setlinfoUpld = dao.setlinfo1(patNo, times, ledgerSn);

src/main/java/thyyxxk/webserver/service/yibao/ZhuYuanYiZhuServer.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.yibao.ZhuYuanYiZhuDao;
 import thyyxxk.webserver.entity.ResultVo;
@@ -86,7 +85,6 @@ public class ZhuYuanYiZhuServer {
      * @param param 需要，住院号，次数，医嘱号
      * @return 返回提示
      */
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> yiZhuTuiFei(YzActOrder param) {
         if (ListUtil.isBlank(param.getTuiFeiList())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择退费数据，￢o(￣-￣ﾒ)");

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.GetDateFormat;
 import thyyxxk.webserver.dao.his.zhuyuanyisheng.CaoYaoYiZhuDao;
@@ -134,7 +133,6 @@ public class CaoYaoYiZhuServer {
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> baoCunCaoYao(YzActOrderCy param) {
         log.info("上传的数据：{}", JSON.toJSONString(param));
         if (ListUtil.isBlank(param.getList())) {

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.GetDateFormat;
 import thyyxxk.webserver.dao.his.zhuyuanyisheng.ShouShuShenQingDao;
@@ -104,7 +103,6 @@ public class ShouShuShenQingServer {
         return ResultVoUtil.success(dao.huoQuShouShuBuWei(StringUtil.isContainChinese(name)));
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> xinZengShouShuShenQing(XinZengShouShu param) {
         log.info("上传数据：{}", JSON.toJSONString(param));
         if (ListUtil.isBlank(param.getList())) {

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.BizException;
@@ -283,7 +282,6 @@ public class YiZhuLuRuServer {
      * @param param 数据
      * @return 返回提示
      */
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> shangChuanYiZhu(XinZhenYiZhu param) {
         if (ListUtil.isBlank(param.getList())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择数据");
@@ -486,8 +484,6 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success();
     }
 
-    @Nullable
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> chaRuYiZhu(XinZhenYiZhu param, List<YzActRecordKss> kssList, String inputCode) {
         if (StringUtil.isBlank(param.getInpatientNo()) || param.getAdmissTimes() == null) {
             throw new BizException(ExceptionEnum.LOGICAL_ERROR, "请先选择患者信息");
@@ -595,7 +591,6 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success(tree);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> baoCunMuBan(yzOrderPattern param) {
         yzOrderPattern yzOrderPattern;
         if (param.getInputType().equals("3")) {

src/main/java/thyyxxk/webserver/utils/JsonXmlUtils.java

@@ -60,7 +60,6 @@ public class JsonXmlUtils {
 
         int idx = xmlSb.indexOf("?>") + 2;
         xmlSb.insert(idx, "<root_chinadaas>").append("</root_chinadaas>");
-        System.out.println(xmlSb.toString());
         return xmlSb.toString();
     }
 

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: his
+      primary: dev
       strict: false
       datasource:
         his:
@@ -73,7 +73,7 @@ si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 
 execute-scheduled: false
 
-#logging:
-#  level:
-#    thyyxxk.webserver.dao: debug
+logging:
+  level:
+    thyyxxk.webserver.dao: debug