修复部分DRG&DIP接口问题

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

@@ -65,6 +65,8 @@ public class DrgDipController {
                     return queryHisOutpCharge(params);
                 case HIS_HSPTZD_PATIENT_BASE:
                     return queryHisHsptzdPatientBase(params);
+                case HIS_HSPTZD_PATIENT_BASE_CY:
+                    return queryHisHsptzdPatientBaseCy(params);
                 case HIS_BABY_INFO:
                     return queryHisBabyInfo(params);
                 case HIS_HSPTZD_CHARGE:
@@ -202,9 +204,7 @@ public class DrgDipController {
 
     private JSONObject queryHisHsptzdPatientBase(RequestParams params) {
         if (null == params.getVisitId()) {
-            List<String> visitIdList = (null == params.getStartDate() || null == params.getEndDate()) ?
-                    dao.selectAllHisHsptzdPatientBase() :
-                    dao.selectHisHsptzdPatientBaseByDateRange(params.getStartDate(), params.getEndDate());
+            List<String> visitIdList = dao.selectAllHisHsptzdPatientBase();
             if (visitIdList.isEmpty()) {
                 return DrgDipResponseFactory.noCorrespondingDataFound();
             }
@@ -222,6 +222,17 @@ public class DrgDipController {
         return DrgDipResponseFactory.success(list);
     }
 
+    private JSONObject queryHisHsptzdPatientBaseCy(RequestParams params) {
+        if (null == params.getStartDate() || null == params.getEndDate()) {
+            return DrgDipResponseFactory.wrongParameters("startDate、endDate不能为空。");
+        }
+        List<String> visitIdList = dao.selectHisHsptzdPatientBaseByDateRange(params.getStartDate(), params.getEndDate());
+        if (visitIdList.isEmpty()) {
+            return DrgDipResponseFactory.noCorrespondingDataFound();
+        }
+        return DrgDipResponseFactory.success(visitIdList);
+    }
+
     private JSONObject queryHisBabyInfo(RequestParams params) {
         if (null == params.getVisitId()) {
             return DrgDipResponseFactory.wrongParameters("visitId不能为空。");

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

@@ -146,7 +146,7 @@ public interface DrgDipDao {
             "tbDoctorId=isnull((select rtrim(d.refer_physician) from zy_actpatient d where d.inpatient_no=a.pat_no), " +
             "(select rtrim(d.refer_physician) from zy_inactpatient d where d.inpatient_no=a.pat_no and d.admiss_times=a.times)), " +
             "hospDischDeptId=(select rtrim(d.zk_ward) from zy_inactpatient d where d.inpatient_no=a.pat_no and d.admiss_times=a.times), " +
-            "hospDischTime=(select rtrim(d.dis_date) from zy_inactpatient d where d.inpatient_no=a.pat_no and d.admiss_times=a.times), " +
+            "hospDischTime=(select convert(varchar(19),d.dis_date,21) from zy_inactpatient d where d.inpatient_no=a.pat_no and d.admiss_times=a.times), " +
             "a.insuplc_admdvs as insurAreaId,a.insutype as insurType,a.med_type as ttmntTypeCode,a.times as hsptzdCount, " +
             "disCode=(select d.icd_code from zy_in_diag_yb d where d.inpatient_no=a.pat_no and d.admiss_times=a.times and d.diag_no=1), " +
             "disName=(select d.icd_text from zy_in_diag_yb d where d.inpatient_no=a.pat_no and d.admiss_times=a.times and d.diag_no=1) " +

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

@@ -63,6 +63,8 @@ public enum DrgDipRequestType {
      */
     HIS_HSPTZD_PATIENT_BASE("his_hsptzd_patient_base"),
 
+    HIS_HSPTZD_PATIENT_BASE_CY("his_hsptzd_patient_base_cy"),
+
     /**
      * 2.8.6 住院婴儿
      * */

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

@@ -12,7 +12,8 @@ public class DrgDipResponseFactory {
         ReturnEntity entity = new ReturnEntity();
         entity.setReturnCode(1);
         entity.setReturnMessage("成功。");
-        entity.setReturnData(JSON.parseArray(JSON.toJSONStringWithDateFormat(data, "yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteNullStringAsEmpty)));
+        entity.setReturnData(JSON.parseArray(JSON.toJSONStringWithDateFormat(data, "yyyy-MM-dd HH:mm:ss",
+                SerializerFeature.WriteNullStringAsEmpty)));
         return JSON.parseObject(JSON.toJSONString(entity));
     }
 

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

@@ -113,7 +113,7 @@ public class HisHsptzdPatientBase {
      * 出院时间
      * */
     @JSONField(name = "HOSP_DISCH_TIME")
-    private Date hospDischTime;
+    private String hospDischTime;
 
     /**
      * 统筹区域

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

@@ -14,6 +14,6 @@ public class MiInsurHospItemsRel {
     /**
      * 医院项目目录编码
      * */
-    @JSONField(name = "DRUG_LIST_ID")
+    @JSONField(name = "ITEM_LIST_ID")
     private String itemListId;
 }