微生物模块

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java

@@ -638,7 +638,8 @@ public class CommonUtil {
         if ("S".equals(yhjs)) return true;
         String userPower = comUsrpowerMapper.getUserPower(yq, yhdh);
         if (userPower == null) return false;
-        return "Y".equals(userPower.substring(powerIdx - 1, 1));
+        if(userPower.length()<powerIdx) return false;
+        return "Y".equals(userPower.substring(powerIdx - 1, powerIdx));
     }
     public byte[] getComUsrdzqm(String yhdh) {
         ComUsrBlob comUsrBlob=comUsrMapper.getComUsrdzqm(yhdh);

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java

@@ -38,7 +38,8 @@ public class LisWorkBase {
     }
     /**获取当前会话循环次数**/
     int getProblemId() {
-        return JsonParamUtils.getParameterToInt("problemId", 0);
+        return ServletUtils.getParameterToInt("problemId", 0);
+        //return JsonParamUtils.getParameterToInt("problemId", 0);
     }
     /**
      * 工作时间校验检验者审核者不允许相同 上班时间上午8点-12点下午2点到5点,周末不算

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkconfirm.java

@@ -2,6 +2,7 @@ package com.czlis.interfaceCommon.utils;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.*;
+import com.czlis.common.utils.ServletUtils;
 import com.czlis.interfaceCommon.constants.ComLogConstants;
 import com.czlis.interfaceCommon.constants.LabPatConstants;
 import com.czlis.interfaceCommon.constants.LabReqmainConstants;

lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java

@@ -14,6 +14,7 @@ import com.czlis.common.exception.user.*;
 import com.czlis.common.utils.DateUtils;
 import com.czlis.common.utils.MessageUtils;
 import com.czlis.common.utils.StringUtils;
+import com.czlis.common.utils.bean.BeanUtils;
 import com.czlis.common.utils.ip.IpUtils;
 import com.czlis.common.asyncmanager.AsyncManager;
 import com.czlis.interfaceCommon.service.TokenService;
@@ -32,10 +33,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
 
 /**
  * 登录校验方法
@@ -67,18 +65,25 @@ public class SysLoginService {
     public String getLocalconfig(String smac){
         return commonUtil.getLocalconfig(smac);
     }
-    public String getOEM(){
+    public Map<String,String> getOEM(){
         Map<String,String> oem=new HashMap<>();
         oem.put("compay","武汉创智天地信息技术有限公司");
         oem.put("version","区域版LIMS V8.001");
         oem.put("phone","027-67849602");
-        oem.put("E-mail","czlis@163.com");
+        oem.put("Email","czlis@163.com");
-        oem.put("appname","实验室管理系统");
+        oem.put("appname","实验室信息管理系统");
-        return oem.toString();
+        return oem;
     }
-    public String gethospList(){
+    public Object gethospList(){
         List<ComDict> comDictlist=commonUtil.getComDictList("HOS");
-        return comDictlist.toString();
+        List<Map<String, Object>> comDictlist0 = new ArrayList<>();
+        for (ComDict table1 : comDictlist) {
+            Map<String, Object>  map= new HashMap<>();
+            map.put("id",table1.getZddh());
+            map.put("name",table1.getZdmc());
+            comDictlist0.add(map);
+        }
+        return comDictlist0;
     }
     /**
      * 登录验证

liswork/src/main/java/com/czlis/liswork/pojo/DTO/MediumDTO.java

@@ -6,10 +6,32 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class MediumDTO {
-    private LabGermsheetNew labGermsheetNew;
+    private Integer gsid;
-    private BactMedium bactMedium;
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String mediumno;
+    private Date sheetdate;
+    private String sheetuser;
+    private String medium;
+    private String condtions;
+    private String smear;
+    private String dyeing;
+    private String colonyresult;
+    private String colonynum;
+    private String otherresult;
+
+    private String mediumname;
+    private String conidtions;
+    private String culturehour;
+    private String watchinterval;
+    private String comments;
+    private String inputcode;
+    private Integer seq;
 }

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java

@@ -532,7 +532,7 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
         labPat.setConfirmdt(shsj);
         labPat.setConfirmer(hdys);
         labPat.setDysj(shsj);
-        commonUtil.delLabPat(jyrq, yq, ybh);
+        commonUtil.delLabPat(jyrq, yq1, ybh);
         commonUtil.insertLabPat(labPat);
         Result result1 = lisWorkUtils.afterconfirm(labPat, problemId);
         if (!"0".equals(result1.getCode())) return result1;
@@ -602,7 +602,7 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
         labPat.setConfirmdt(shsj);
         labPat.setConfirmer(hdys);
         labPat.setDysj(shsj);
-        commonUtil.delLabPat(jyrq, yq, ybh);
+        commonUtil.delLabPat(jyrq, yq1, ybh);
         commonUtil.insertLabPat(labPat);
         Result result1 = lisWorkUtils.afterconfirm(labPat, problemId);
         if (!"0".equals(result1.getCode())) return result1;