Merge remote-tracking branch 'origin/master'

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

@@ -109,9 +109,13 @@ public class LisWorkServiceImpl implements LisWorkService {
         List<LabInputcol> labInputcolList = commonUtil.getLabInputcol(yq);
         for(LabInputcol labInputcol:labInputcolList){
             String zdmc=labInputcol.getZdmc();
+          //  if("!".equals(labInputcol.getMrts()))labInputcol.setKj("0");
             labInputcol.setZdlb("1");
             labInputcol.setDict("");
             switch(zdmc){
+                case "shcs":
+                    labInputcol.setKj("0");
+                    break;
                 case "brly":
                     labInputcol.setDict("PT");
                     break;