lighter 1 年之前
父節點
當前提交
e3fb82f43c

+ 6 - 6
src/main/java/thyyxxk/sizyfeeoprnsystm/service/SiZyFeeService.java

@@ -167,7 +167,7 @@ public class SiZyFeeService {
         if (o.getMidSetl()) {
             List<Integer> notAllowedSns = zyDao.selectNotAllowedSnForMidSetl(o.getInpatientNo(), o.getAdmissTimes(),
                     o.getLedgerSn(), o.getEndtime());
-            if (null != notAllowedSns && notAllowedSns.size() > 0) {
+            if (!notAllowedSns.isEmpty()) {
                 List<Integer> tempSns = new ArrayList<>();
                 for (int sn : notAllowedSns) {
                     tempSns.add(sn);
@@ -177,7 +177,7 @@ public class SiZyFeeService {
                         tempSns.clear();
                     }
                 }
-                if (tempSns.size() > 0) {
+                if (!tempSns.isEmpty()) {
                     zyPtnt.setDetailSns(tempSns);
                     revokeUploadFees(zyPtnt);
                 }
@@ -186,7 +186,7 @@ public class SiZyFeeService {
         Map<String, Queue<FeeDtle>> allFees = getAllFeesNotUploaded(o);
         Queue<FeeDtle> allPositiveFees = allFees.get("positive");
         Queue<FeeDtle> allNegativeFees = allFees.get("negative");
-        if (allPositiveFees.size() == 0 && allNegativeFees.size() == 0) {
+        if (allPositiveFees.isEmpty() && allNegativeFees.isEmpty()) {
             return hospitalizationPreSettlement(zyPtnt, o);
         }
         int index = 0;
@@ -238,7 +238,7 @@ public class SiZyFeeService {
 
     private int[] prepareUploadFees(Queue<FeeDtle> feeQueue, int index, int feeSize, ZyPatientInfo p, String sid) {
         int[] result = new int[] {0,0};
-        if (feeQueue.size() == 0) {
+        if (feeQueue.isEmpty()) {
             return result;
         }
         JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_HOSPITALIZATION_FEE_DETAILS,
@@ -248,7 +248,7 @@ public class SiZyFeeService {
         socketMessage.put("percentage", 0);
         List<FeeDtle> tempList = new ArrayList<>();
         RestTemplate template = new RestTemplate();
-        while (feeQueue.size() > 0) {
+        while (!feeQueue.isEmpty()) {
             FeeDtle feeDtle = feeQueue.poll();
             assert feeDtle != null;
             if (StringUtil.isBlank(feeDtle.getBilgDrCodg())) {
@@ -298,7 +298,7 @@ public class SiZyFeeService {
                         new PureCodeName(sid, socketMessage.toJSONString()), String.class);
             }
         }
-        if (tempList.size() > 0) {
+        if (!tempList.isEmpty()) {
             int[] upldres = executeUploadFees(input, tempList, p);
             index += upldres[0];
             if (upldres[1] > 0) {

File diff suppressed because it is too large
+ 13 - 0
src/main/java/thyyxxk/sizyfeeoprnsystm/utils/Test.java


+ 1 - 1
src/main/resources/application-prod.yml

@@ -30,6 +30,6 @@ mybatis:
 si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
 si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-upld-notify-url: http://172.16.32.160:8706/socketMessage
+upld-notify-url: http://172.16.32.160:8077/socketMessage
 
 execute-scheduled: true

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
     <!-- 日志根目录-->
     <springProperty scope="context" name="LOG_HOME" source="logging.path"
-                    defaultValue="D:\logs\SiFeeOprnSystm\zy"/>
+                    defaultValue="serverlog"/>
 
     <!-- 日志级别 -->
     <springProperty scope="context" name="LOG_ROOT_LEVEL" source="logging.level.root" defaultValue="INFO"/>

Some files were not shown because too many files changed in this diff