DRG&DIP接口问题

src/main/java/thyyxxk/webserver/controller/api/forpowersi/DrgDipController.java

@@ -327,6 +327,9 @@ public class DrgDipController {
         if (list.isEmpty()) {
             return DrgDipResponseFactory.noCorrespondingDataFound();
         }
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setOrder(i + 1);
+        }
         return DrgDipResponseFactory.success(list);
     }
 

src/main/java/thyyxxk/webserver/dao/his/api/forpowersi/drgdip/DrgDipDao.java

@@ -242,7 +242,7 @@ public interface DrgDipDao {
 
     @Select("select " +
             "mdtrt_id,psn_no,psn_type,cvlserv_flag,medfee_sumamt, " +
-            "setlTime=convert(varchar(19), a.setl_time, 21), " +
+            "setlTime=convert(varchar(19), a.setl_time, 21),insutype, " +
             "fulamt_ownpay_amt,overlmt_selfpay,preselfpay_amt,inscp_scp_amt, " +
             "act_pay_dedc,hifp_pay,pool_prop_selfpay,cvlserv_pay,hifes_pay, " +
             "hifmi_pay,hifob_pay,maf_pay,oth_pay,fund_pay_sumamt,psn_part_amt, " +
@@ -277,21 +277,16 @@ public interface DrgDipDao {
     List<Yibao5204> selectYibao5204(String visitId);
 
     @Select("select " +
-            "b.mdtrt_id as visitId, " +
-            "dagnsCategory=1, " +
-            "a.diag_no as disDiagNo, " +
+            "b.mdtrt_id as visitId,dagnsCategory=1, " +
             "dagnsTypeId=case when diag_no=1 then 1 else 2 end, " +
-            "dagnsWayId=1, " +
-            "icd_text as diseaseName, " +
-            "icd_code " +
-            "from zy_in_diag_yb a, t_si_setlinfo b " +
+            "dagnsWayId=1,icd_text as diseaseName, " +
+            "icd_code from zy_in_diag_yb a, t_si_setlinfo b " +
             "where b.mdtrt_id=#{visitId} and b.pat_no=a.inpatient_no " +
             "and b.times=a.admiss_times " +
             "union " +
             "select " +
             "b.mdtrt_id as visitId, " +
             "dagnsCategory=case when si_diag_type in ('1','2') then 1 else 2 end, " +
-            "a.dis_diag_no, " +
             "dagnsTypeId=case when dis_diag_no=1 then 1 else 2 end, " +
             "dagnsWayId=2, " +
             "rtrim(dis_diag_comment) as diseaseName, " +

src/main/java/thyyxxk/webserver/entity/api/forpowersi/drgdip/HisPatientDagns.java

@@ -13,9 +13,7 @@ public class HisPatientDagns {
     private String dagnsCategory;
 
     @JSONField(name = "ORDER")
-    private String order;
-
-    private String disDiagNo;
+    private Integer order;
 
     @JSONField(name = "DAGNS_TYPE_ID")
     private String dagnsTypeId;
@@ -28,8 +26,4 @@ public class HisPatientDagns {
 
     @JSONField(name = "ICD_CODE")
     private String icdCode;
-
-    public String getOrder() {
-        return disDiagNo;
-    }
 }

src/main/java/thyyxxk/webserver/entity/api/forpowersi/drgdip/YibaoSetlinfo2304.java

@@ -15,6 +15,9 @@ public class YibaoSetlinfo2304 {
     @JSONField(name = "PSN_TYPE")
     private String psnType;
 
+    @JSONField(name = "INSUTYPE")
+    private String insutype;
+
     @JSONField(name = "CVLSERV_FLAG")
     private String cvlservFlag;