优化试算参数

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiZyDao.java

@@ -141,10 +141,11 @@ public interface SiZyDao {
      * @return 预结算参数
      */
     @Select("select psn_no,certno as mdtrtCertNo,certno,mdtrtCertType='02', " +
-            "psn_cert_type,psn_type,mdtrt_id,insutype,insuplc_admdvs, " +
+            "psn_cert_type,psn_type,psn_name,mdtrt_id,insutype,insuplc_admdvs, " +
             "medfeeSumamt=(select sum(charge_fee) from zy_detail_charge b where b.inpatient_no=a.pat_no " +
             "and b.admiss_times=a.times and b.ledger_sn=a.ledger_sn and isnull(b.infant_flag,0)=0 " +
-            "and trans_flag_yb!=2 and charge_date<=#{endtime}) " +
+            "and trans_flag_yb!=2 and charge_date<=#{endtime})," +
+            "expContent=(select d.exp_content from zy_actpatient d where d.inpatient_no=#{patNo}) " +
             "from t_si_pat_info a where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
     PreSetlmt selectPreSetlmt(@Param("patNo") String patNo,
                               @Param("times") int times,

src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/PreSetlmt.java

@@ -102,4 +102,16 @@ public class PreSetlmt {
      * */
     @JSONField(name = "insuplc_admdvs")
     private String insuplcAdmdvs;
+
+    /**
+     * 就医地医保区划
+     * */
+    @JSONField(name = "mdtrtarea_admvs")
+    private String mdtrtareaAdmvs;
+
+    /**
+     * 额外内容
+     * */
+    @JSONField(name = "exp_content")
+    private String expContent;
 }

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

@@ -258,6 +258,8 @@ public class SiZyService {
         preSetlmt.setPsnSetlway(p.getDbg() ? PsnSetlWay.SETTLE_BY_QUOTA.getCode() : PsnSetlWay.SETTLE_BY_ITEMS.getCode());
         preSetlmt.setAcctUsedFlag(YesOrNo.NO.getCodeStr());
         preSetlmt.setMidSetlFlag(YesOrNo.NO.getCodeStr());
+        preSetlmt.setMdtrtareaAdmvs(SiUtil.getInstitutionArea(preSetlmt.getInsuplcAdmdvs()));
+
         JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.HOSPITALIZATION_PRE_SETTLEMENT, preSetlmt.getInsuplcAdmdvs());
         String ref = JSONObject.toJSONString(preSetlmt);
         input.getJSONObject("input").put("data", JSONObject.parseObject(ref));