diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index cd373f2..b7fe19f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -7,7 +7,6 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.SieveStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.LogUtil; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -71,6 +70,7 @@ public class PatientsService { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } + if(!StringUtils.isEmpty(patientsQuery.getDesc())){ return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, patientsQuery.getSort())); } @@ -78,7 +78,6 @@ public class PatientsService { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort())); } - return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } 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 a376eb3..49d84ee 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,5 +1,7 @@ package com.lyms.platform.operate.web; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.query.PatientsQuery; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; import org.springframework.util.StopWatch; @@ -14,6 +16,15 @@ public class Test { private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); public static void main(String[] args) throws Exception{ + PatientsQuery patientsQuery = new PatientsQuery(); + //排查本院隐藏建档 + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(1); + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery()); + + StopWatch stopWatch = new StopWatch("time"); String[] arr={ "王二六","张三", "李四", "王五","赵六", "JAVA", "123","怡情"}; List names = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index b647db4..79c3b9c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5,6 +5,7 @@ import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; @@ -12,10 +13,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.AntExcAddOther; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; -import com.lyms.platform.operate.web.result.BabyCheckPageResult; -import com.lyms.platform.operate.web.result.BabyPageResult; -import com.lyms.platform.operate.web.result.HighScoreResult; -import com.lyms.platform.operate.web.result.ResidentsPageResult; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.*; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; @@ -30,13 +28,11 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.bson.types.ObjectId; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; import java.util.*; @@ -103,7 +99,8 @@ public class ViewFacade { @Autowired private CouponMapper couponMapper; - + @Autowired + private PatientServiceFacade patientServiceFacade; /** * 建档查询 * @@ -133,7 +130,10 @@ public class ViewFacade { map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getFuckLastMens())); } map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasisDoctorId())); - + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,0); + List patientSerResults = (List) baseResponse.getObject(); + map.put("patientSerResults",patientSerResults); + //显示服务信息 br.setData(map); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功");