优化

src/main/java/thyyxxk/webserver/dao/his/inpatient/casefrontsheet/CaseFrontSheetDao.java

@@ -281,17 +281,6 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
     @Select("select rtrim(code) as code,name from zd_icd9_cm3 where code=#{code}")
     CaseFrontsheetSurgery selectSurgeryByCode(@Param("code") String code);
 
-    @Select("select (select count(1) from yz_act_order with(nolock) where order_code in ('06026','06053','06027') " +
-            "and inpatient_no=#{bah} and admiss_times=#{times}) + " +
-            "(select count(1) from yz_inact_order with(nolock) where order_code in ('06026','06053','06027') and " +
-            "inpatient_no=#{bah} and admiss_times=#{times})")
-    int getDismissOrder(@Param("bah") String bah, @Param("times") int times);
-
-    @Select("select (select count(1) from yz_act_order with(nolock) where order_code='05973' and inpatient_no=#{bah} " +
-            "and admiss_times=#{times}) + (select count(1) from yz_inact_order with(nolock) where order_code='05973' " +
-            "and inpatient_no=#{bah} and admiss_times=#{times})")
-    int getDeathOrder(@Param("bah") String bah, @Param("times") int times);
-
     @Update("update a_patient_mi set name=#{name}, " +
             "sex=#{sex}, " +
             "health_card_no=#{healthCardNo}," +

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -287,11 +287,6 @@ public class CaseFrontSheetMainService {
         mergeObject(sheet1, sheet);
         mergeObject(sheet2, sheet);
         mergeObject(sheet3, sheet);
-//        if (dao.getDismissOrder(bah, times) > 0) {
-//            sheet.setZyDismissWay("0");
-//        } else if (dao.getDeathOrder(bah, times) > 0) {
-//            sheet.setZyDismissWay("4");
-//        }
         Integer days = DateUtil.daysBetween(sheet.getDismissDate(), sheet.getAdmissDate());
         sheet.setAdmissDays(0 == days ? "1" : String.valueOf(days));
         if (null == sheet.getQualityControlDate()) {
@@ -328,7 +323,7 @@ public class CaseFrontSheetMainService {
             if (StringUtil.notBlank(blfxElement)) {
                 JSONObject blfxObj = JSONObject.parseObject(blfxElement);
                 JSONArray blfxArray = blfxObj.getJSONArray("病例分型");
-                if (null != blfxArray && blfxArray.size() > 0) {
+                if (null != blfxArray && !blfxArray.isEmpty()) {
                     JSONObject blfxItem = blfxArray.getJSONObject(0);
                     sheet.setCaseClassification(blfxItem.getString("code"));
                 }
@@ -742,7 +737,7 @@ public class CaseFrontSheetMainService {
             final String bah = sheet.getBah();
             final int times = sheet.getAdmissTimes();
             dao.writeBaOpLog(optype, info.getStaffId(), bah, times);
-            if (sheet.getDisdiagList().size() > 0) {
+            if (!sheet.getDisdiagList().isEmpty()) {
                 sheet.setMainDisdiagStatus(sheet.getDisdiagList().get(0).getDismissStatus());
             }
             return optype == 1 ? saveSheet(sheet) : archiveSheet(sheet);
@@ -766,7 +761,7 @@ public class CaseFrontSheetMainService {
             JSONObject responseEntity = powersi.getJSONObject("responseEntity");
             if (null != responseEntity) {
                 JSONArray retarr = responseEntity.getJSONArray("newSettleMemInfo");
-                if (null != retarr && retarr.size() > 0) {
+                if (null != retarr && !retarr.isEmpty()) {
                     for (int i = 0; i < retarr.size(); i++) {
                         advice.add(new CodeName("", retarr.getJSONObject(i).getString("result_msg")));
                     }