发药记录诊断修改

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfSpiritAnestheticPrintMapper.java

@@ -27,6 +27,7 @@ public interface YfSpiritAnestheticPrintMapper {
             " name=rtrim(c.name)," +
             " sex=c.sex," +
             " age=c.age," +
+            " a.times," +
             " social_no=c.social_no," +
             " drugname=b.name," +
             " quantity=case when a.receipt_no<![CDATA[<]]>'0' then -abs(a.quantity*cy_fy) else a.quantity*cy_fy end ," +
@@ -214,6 +215,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       b.birth_day," +
             "       warn_dept_name=h.name," +
             "       id=a.patient_id," +
+            "       a.times," +
             "       icd_text=cast(isnull(i.icd_text,'') as varchar(50))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfSpiritAnestheticPrintServiceImpl.java

@@ -1,11 +1,13 @@
 package cn.hnthyy.thmz.service.impl.his.yf;
 
 import cn.hnthyy.thmz.entity.his.mz.Employee;
+import cn.hnthyy.thmz.entity.his.mz.MzBlRecord;
 import cn.hnthyy.thmz.entity.his.yp.YpZdDict;
 import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
 import cn.hnthyy.thmz.entity.his.zy.APatientMi;
 import cn.hnthyy.thmz.entity.his.zy.ZyActpatient;
 import cn.hnthyy.thmz.mapper.his.mz.EmployeeMapper;
+import cn.hnthyy.thmz.mapper.his.mz.MzBlRecordMapper;
 import cn.hnthyy.thmz.mapper.his.yf.YfSpiritAnestheticPrintMapper;
 import cn.hnthyy.thmz.mapper.his.yp.YpZdDictMapper;
 import cn.hnthyy.thmz.mapper.his.yp.YpZdManufactoryMapper;
@@ -45,10 +47,20 @@ public class YfSpiritAnestheticPrintServiceImpl implements YfSpiritAnestheticPri
     @SuppressWarnings("all")
     @Autowired
     private ZdUnitCodeMapper zdUnitCodeMapper;
+    @SuppressWarnings("all")
+    @Autowired
+    private MzBlRecordMapper mzBlRecordMapper;
 
     @Override
     public List<MzSendMedicineVo> queryMzSpiritAnestheticPrint(String beginDate, String endDate, String chargeItemCode, String unitCode, String[] drugFlags) {
-        return yfSpiritAnestheticPrintMapper.selectMzSpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags);
+        List<MzSendMedicineVo> mzSendMedicineVos = yfSpiritAnestheticPrintMapper.selectMzSpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags);
+        mzSendMedicineVos.stream().forEach(mzSendMedicineVo -> {
+            if(StringUtils.isBlank(mzSendMedicineVo.getIcdText())){
+                MzBlRecord mzBlRecord = mzBlRecordMapper.selectMzBlRecordByPatientIdAndTimes(mzSendMedicineVo.getPatientId(),mzSendMedicineVo.getTimes());
+                mzSendMedicineVo.setIcdText(mzBlRecord.getTentativeDiagnosis());
+            }
+        });
+        return mzSendMedicineVos;
     }
 
     @Override
@@ -62,9 +74,23 @@ public class YfSpiritAnestheticPrintServiceImpl implements YfSpiritAnestheticPri
         if(sendDrugRecordVo.getQueryScope() == 0){
             sendDrugRecordVos.addAll(getYjRecord(sendDrugRecordVo));
             sendDrugRecordVos.addAll(yfSpiritAnestheticPrintMapper.selectZyRecord(sendDrugRecordVo));
-            sendDrugRecordVos.addAll(yfSpiritAnestheticPrintMapper.selectMzRecord(sendDrugRecordVo));
+            List<SendDrugRecordVo> vos = yfSpiritAnestheticPrintMapper.selectMzRecord(sendDrugRecordVo);
+            vos.stream().forEach(mz -> {
+                if(StringUtils.isBlank(mz.getIcdText())){
+                    MzBlRecord mzBlRecord = mzBlRecordMapper.selectMzBlRecordByPatientIdAndTimes(mz.getId(),mz.getTimes());
+                    mz.setIcdText(mzBlRecord.getTentativeDiagnosis());
+                }
+            });
+            sendDrugRecordVos.addAll(vos);
         }else if(sendDrugRecordVo.getQueryScope() == 1){
-            sendDrugRecordVos.addAll(yfSpiritAnestheticPrintMapper.selectMzRecord(sendDrugRecordVo));
+            List<SendDrugRecordVo> vos = yfSpiritAnestheticPrintMapper.selectMzRecord(sendDrugRecordVo);
+            vos.stream().forEach(mz -> {
+                if(StringUtils.isBlank(mz.getIcdText())){
+                    MzBlRecord mzBlRecord = mzBlRecordMapper.selectMzBlRecordByPatientIdAndTimes(mz.getId(),mz.getTimes());
+                    mz.setIcdText(mzBlRecord.getTentativeDiagnosis());
+                }
+            });
+            sendDrugRecordVos.addAll(vos);
         }else if(sendDrugRecordVo.getQueryScope() == 2){
             sendDrugRecordVos.addAll(getYjRecord(sendDrugRecordVo));
             sendDrugRecordVos.addAll(yfSpiritAnestheticPrintMapper.selectZyRecord(sendDrugRecordVo));

src/main/java/cn/hnthyy/thmz/vo/SendDrugRecordVo.java

@@ -22,6 +22,8 @@ public class SendDrugRecordVo implements Serializable {
     private Date birthDay;
     //住院次数
     private Integer admissTimes;
+    //门诊就诊次数
+    private Integer times;
     //申请科室
     private String warnDeptName;
     //申请科室编码