diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index a11b801..8f10ab0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -1,12 +1,9 @@ package com.lyms.platform.operate.web; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.query.BabyModelQuery; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; -import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -20,18 +17,6 @@ public class Test { public static void main(String[] args) throws Exception { - BabyModelQuery babyQuery = new BabyModelQuery(); - List list = new ArrayList(); - list.add("1");//转诊,建档已接受 - list.add("2");//隐藏建档 - babyQuery.setEnableListNot(list); - List buildType = new ArrayList(); - buildType.add(1);//儿童直接建档 - buildType.add(2);//产妇分娩建档 - babyQuery.setBuildTypeList(buildType); - babyQuery.setYn(YnEnums.YES.getId()); - babyQuery.setNeed("need"); - System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); /* Mongo mongo = new Mongo("119.90.57.26", 10001); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index 930ee94..ad46975 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -116,7 +116,7 @@ public class PatientServiceSysFacade implements SysBaseFacade { if (patientService.getPerType() != null && patientService.getPerType() == 2) {//儿童建档服务数据处理 BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); babyBookbuildingAddRequest.setId(patientService.getParentid()); - if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == patientService.getSerType()) { + if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == patientService.getSerType().intValue()) { babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); if (patientService.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());