浏览代码

DRG&DIP接口,字符串数组转为对象数组

lighter 2 年之前
父节点
当前提交
4e3147fb2d

+ 4 - 4
src/main/java/thyyxxk/webserver/controller/api/forpowersi/DrgDipController.java

@@ -204,7 +204,7 @@ public class DrgDipController {
 
     private JSONObject queryHisHsptzdPatientBase(RequestParams params) {
         if (null == params.getVisitId()) {
-            List<String> visitIdList = dao.selectAllHisHsptzdPatientBase();
+            List<VisitId> visitIdList = dao.selectAllHisHsptzdPatientBase();
             if (visitIdList.isEmpty()) {
                 return DrgDipResponseFactory.noCorrespondingDataFound();
             }
@@ -226,7 +226,7 @@ public class DrgDipController {
         if (null == params.getStartDate() || null == params.getEndDate()) {
             return DrgDipResponseFactory.wrongParameters("startDate、endDate不能为空。");
         }
-        List<String> visitIdList = dao.selectHisHsptzdPatientBaseByDateRange(params.getStartDate(), params.getEndDate());
+        List<VisitId> visitIdList = dao.selectHisHsptzdPatientBaseByDateRange(params.getStartDate(), params.getEndDate());
         if (visitIdList.isEmpty()) {
             return DrgDipResponseFactory.noCorrespondingDataFound();
         }
@@ -345,7 +345,7 @@ public class DrgDipController {
             if (null == params.getStartDate() || null == params.getEndDate()) {
                 return DrgDipResponseFactory.wrongParameters("startDate、endDate、visitId不能同时为空。");
             }
-            List<String> visitIdList = dao.selectSignedVistiId(params.getStartDate(), params.getEndDate());
+            List<VisitId> visitIdList = dao.selectSignedVistiId(params.getStartDate(), params.getEndDate());
             if (visitIdList.isEmpty()) {
                 return DrgDipResponseFactory.noCorrespondingDataFound();
             }
@@ -379,7 +379,7 @@ public class DrgDipController {
             if (null == params.getStartDate() || null == params.getEndDate()) {
                 return DrgDipResponseFactory.wrongParameters("startDate、endDate、visitId不能同时为空。");
             }
-            List<String> visitIdList = dao.getSettlementDocumentVisitID(params.getStartDate(), params.getEndDate());
+            List<VisitId> visitIdList = dao.getSettlementDocumentVisitID(params.getStartDate(), params.getEndDate());
             if (visitIdList.isEmpty()) {
                 return DrgDipResponseFactory.noCorrespondingDataFound();
             }

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

@@ -127,14 +127,14 @@ public interface DrgDipDao {
             "and a.times=b.times and b.bill_item_code!='TC' b.charge_item_code!='BILL99'")
     List<HisOutpCharge> selectHisOutpCharge(String visitId);
 
-    @Select("select b.mdtrt_id from zy_actpatient a, t_si_pat_info b where a.inpatient_no=b.pat_no " +
+    @Select("select b.mdtrt_id as visitId from zy_actpatient a, t_si_pat_info b where a.inpatient_no=b.pat_no " +
             "and a.admiss_times=b.times and a.times_billed=b.ledger_sn and b.mdtrt_id is not null and b.med_type!='42'")
-    List<String> selectAllHisHsptzdPatientBase();
+    List<VisitId> selectAllHisHsptzdPatientBase();
 
-    @Select("select b.mdtrt_id from zy_inactpatient a, t_si_pat_info b where a.inpatient_no=b.pat_no " +
+    @Select("select b.mdtrt_id as visitId from zy_inactpatient a, t_si_pat_info b where a.inpatient_no=b.pat_no " +
             "and a.admiss_times=b.times and a.times_billed=b.ledger_sn and b.mdtrt_id is not null " +
             "and b.med_type!='42' and a.dis_date>=#{start} and a.dis_date<=#{end} ")
-    List<String> selectHisHsptzdPatientBaseByDateRange(String start, String end);
+    List<VisitId> selectHisHsptzdPatientBaseByDateRange(String start, String end);
 
     @Select("select " +
             "mdtrt_id as visitId,pat_no as admNo,psn_name as name,gend as sexId, " +
@@ -307,10 +307,10 @@ public interface DrgDipDao {
             "where b.mdtrt_id=#{visitId} and b.pat_no=a.bah and b.times=a.times")
     List<HisPatientOprtInfo> selectHisPatientOprtInfo(String visitId);
 
-    @Select("select b.mdtrt_id from t_case_frontsheet_main a,t_si_setlinfo b " +
+    @Select("select b.mdtrt_id as visitId from t_case_frontsheet_main a,t_si_setlinfo b " +
             "where a.sign_date>=#{start} and a.sign_date<=#{end} and " +
             "a.bah=b.pat_no and a.admiss_times=b.times")
-    List<String> selectSignedVistiId(String start, String end);
+    List<VisitId> selectSignedVistiId(String start, String end);
 
     @Select("select " +
             "username='长沙泰和医院', " +
@@ -428,7 +428,7 @@ public interface DrgDipDao {
 
     @Select("select mdtrt_id as visit_id from t_settlement_setlinfo " +
             "where dcla_time >= #{startTime} and dcla_time <= #{endTime} ")
-    List<String> getSettlementDocumentVisitID(String startTime, String endTime);
+    List<VisitId> getSettlementDocumentVisitID(String startTime, String endTime);
 
     @Select("select mdtrt_id as visit_id,psn_no,setl_id," +
             "open_date= (select convert(varchar(19), sign_date, 21) " +

+ 10 - 0
src/main/java/thyyxxk/webserver/entity/api/forpowersi/drgdip/VisitId.java

@@ -0,0 +1,10 @@
+package thyyxxk.webserver.entity.api.forpowersi.drgdip;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class VisitId {
+    @JSONField(name = "VISIT_ID")
+    private String visitId;
+}