yeguodong 4 روز پیش
والد
کامیت
cabb435fec

+ 2 - 1
src/main/java/thyyxxk/simzfeeoprnsystm/dao/SiMzDao.java

@@ -80,8 +80,9 @@ public interface SiMzDao {
             "charge_fee as detItemFeeSumamt, " +
             "quantity as cnt, price as pric, " +
             "hospApprFlag=isnull(hosp_appr_flag, 0), " +
-            "bilgDrCodg=(select rtrim(code) from a_employee_mi where code=input_staff), " +
+            "bilgDrCodg=(select rtrim(yb_code) from a_employee_mi where code=input_staff), " +
             "ordersDrCode=(select rtrim(yb_code) from a_employee_mi where code=input_staff), " +
+            "ybName=(select rtrim(yb_name) from a_employee_mi where code=input_staff), " +
             "input_man as bilgDrName,input_man as ordersDrName " +
             "from t_mt_receipt where patient_id=#{patNo} and times=#{times} and yb_trans_flag=0 ")
     List<FeeDetail> selectOutpatientFees(String patNo, int times);

+ 3 - 0
src/main/java/thyyxxk/simzfeeoprnsystm/pojo/FeeDetail.java

@@ -206,4 +206,7 @@ public class FeeDetail {
     @JSONField(name = "matn_fee_flag")
     private String matnFeeFlag;
 
+    @JSONField(name = "yb_name")
+    private String ybName;
+
 }

+ 4 - 5
src/main/java/thyyxxk/simzfeeoprnsystm/service/SiMzFeeService.java

@@ -352,14 +352,13 @@ public class SiMzFeeService {
 
             // 当医生有医保姓名时,优先使用医保姓名
             try {
-                String ybName = mzDao.getYbName(item.getBilgDrCodg());
-                if(StringUtil.isNotEmpty(ybName)) {
-                    log.info("门诊费用上传医生{},使用医保姓名:{}", item.getBilgDrName(), ybName);
-                    item.setBilgDrName(ybName);
+                if(StringUtil.isNotEmpty(item.getYbName())) {
+                    log.info("门诊费用上传医生{},使用医保姓名:{}", item.getBilgDrName(), item.getYbName());
+                    item.setBilgDrName(item.getYbName());
                 }
             } catch (Exception e) {
                 log.error(e.getMessage());
-                log.error("获取医保姓名出错:{}", item.getBilgDrCodg());
+                log.error("获取医保姓名出错:{}", item.getYbName());
             }
         });
         JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_OUTPATIENT_FEE_DETAILS,