号表科室集合更新

src/main/java/cn/hnthyy/thmz/service/impl/his/zd/ZdUnitCodeServiceImpl.java

@@ -205,7 +205,9 @@ public class ZdUnitCodeServiceImpl implements ZdUnitCodeService {
         initMap(null, YesNoEnum.NO);
         map.forEach((s, zdUnitCode) -> {
             if (YesNoEnum.NO.code.equals(zdUnitCode.getDelFlag())) {
-                if (YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) && YesNoEnum.YES.code.equals(zdUnitCode.getGhjzFlag())) {
+//                System.out.println(zdUnitCode.getName()+zdUnitCode.getMzFlag()+zdUnitCode.getGhjzFlag());
+//                System.out.println(YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) +"and"+ YesNoEnum.YES.code.equals(zdUnitCode.getGhjzFlag()));
+                if (YesNoEnum.YES.code.equals(zdUnitCode.getMzFlag()) && YesNoEnum.YES.code.equals(StringUtils.isEmpty(zdUnitCode.getGhjzFlag())?zdUnitCode.getGhjzFlag():Integer.parseInt(zdUnitCode.getGhjzFlag()))) {
                     list.add(zdUnitCode);
                 }
             }