Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/dao/his/medicaladvice/drugmanage/DrugSubmitDao.java

@@ -620,10 +620,9 @@ public interface DrugSubmitDao {
                  "<if test=\"alwaysFlag=='a'.toString\">",
                  "      ,  order_date=a.order_date  " ,
                  "</if>",
-                 " FROM yp_zy_patient a,yp_zd_dict b,yp_zd_manufactory c" ,
-                 " where" ,
-                 "        b.manu_code*=c.code " ,
-                 "                  and   a.confirm_time <![CDATA[>=]]> #{startDate} " ,
+                 " FROM yp_zy_patient a,yp_zd_dict b left join yp_zd_manufactory c " +
+                         "on b.manu_code=c.code " ,
+                 " where  a.confirm_time <![CDATA[>=]]> #{startDate} " ,
                  "                 and    a.confirm_time <![CDATA[<=]]> #{endDate} " ,
                  "                 and    a.ward_code = #{wardCode} " ,
                  "                 and    a.charge_code=b.code  " ,

src/main/java/thyyxxk/webserver/service/outpatient/triage/TriageSettingsService.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.service.outpatient.triage;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.dao.his.outpatient.triage.TriageSettingsDao;
@@ -12,6 +14,7 @@ import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,16 +23,10 @@ import java.util.List;
 @Service
 public class TriageSettingsService {
     private final TriageSettingsDao dao;
+    @Setter
+    @Getter
     private static List<CodeName> reqArr;
 
-    public static List<CodeName> getReqArr() {
-        return reqArr;
-    }
-
-    public static void setReqArr(List<CodeName> arr) {
-        reqArr = arr;
-    }
-
     @Autowired
     public TriageSettingsService(TriageSettingsDao dao) {
         this.dao = dao;
@@ -64,6 +61,9 @@ public class TriageSettingsService {
 
     public ResultVo<List<MzfzZdDeptRoom>> getChosenRoom() {
         String[] deptCodes = StringUtil.triageDeptString2Array(dao.getChosenDept(TokenUtil.getInstance().getTokenUserId()));
+        if (deptCodes.length == 0) {
+            return ResultVoUtil.success(new ArrayList<>());
+        }
         return ResultVoUtil.success(dao.getChosenRoom(deptCodes));
     }
 

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrServer.java

@@ -84,12 +84,17 @@ public class EmrServer {
     @PostConstruct
     @Scheduled(cron = "* * */12 * * ?")
     public void token() {
-        String URL = EMR_URL.replace("/emr/runtime/api/v1", "");
-        String result = HttpRequest.post(URL + "/emr/runtime/api/v1/oauth/token")
-                .header("Authorization", "Basic " + Base64.encode("user:dc71ccfec05b799ad52360c48d504019"))
-                .form("grant_type", "client_credentials").execute().body();
-        JSONObject data = JSONObject.parseObject(result);
-        emrToken = data.getString("access_token");
+        if (EMR_URL == null) {
+            return;
+        }
+        try {
+            String URL = EMR_URL.replace("/emr/runtime/api/v1", "");
+            String result = HttpRequest.post(URL + "/emr/runtime/api/v1/oauth/token")
+                    .header("Authorization", "Basic " + Base64.encode("user:dc71ccfec05b799ad52360c48d504019"))
+                    .form("grant_type", "client_credentials").execute().body();
+            JSONObject data = JSONObject.parseObject(result);
+            emrToken = data.getString("access_token");
+        } catch (Exception ignored) { }
     }
 
     public EmrServer(EmrPatientDao dao,