Commit e384ec89fb9f700cf7f6ded69dfdf4be2b5d44b1
1 parent
d86f322fcd
Exists in
master
and in
6 other branches
追访
Showing 3 changed files with 18 additions and 17 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
e384ec8
| ... | ... | @@ -766,14 +766,6 @@ |
| 766 | 766 | condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN); |
| 767 | 767 | } |
| 768 | 768 | |
| 769 | - if (StringUtils.isNotEmpty(queryNo)) { | |
| 770 | - MongoCondition c = MongoCondition.newInstance(); | |
| 771 | - MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE); | |
| 772 | - MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS); | |
| 773 | - MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS); | |
| 774 | - MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); | |
| 775 | - condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3, con4})); | |
| 776 | - } | |
| 777 | 769 | |
| 778 | 770 | if (null != sex) { |
| 779 | 771 | condition = condition.and("sex", sex, MongoOper.IS); |
| ... | ... | @@ -887,6 +879,19 @@ |
| 887 | 879 | MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); |
| 888 | 880 | MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); |
| 889 | 881 | condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); |
| 882 | + } | |
| 883 | + | |
| 884 | + if (StringUtils.isNotEmpty(queryNo)) { | |
| 885 | + MongoCondition c1 = MongoCondition.newInstance(); | |
| 886 | + MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE); | |
| 887 | + MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS); | |
| 888 | + MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS); | |
| 889 | + MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); | |
| 890 | + if (c != null) { | |
| 891 | + c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); | |
| 892 | + } else { | |
| 893 | + c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); | |
| 894 | + } | |
| 890 | 895 | } |
| 891 | 896 | |
| 892 | 897 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
e384ec8
| ... | ... | @@ -15,7 +15,6 @@ |
| 15 | 15 | import com.lyms.platform.operate.web.service.ITrackDownService; |
| 16 | 16 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 17 | 17 | import com.lyms.platform.operate.web.utils.UnitConstants; |
| 18 | -import com.lyms.platform.operate.web.worker.CourseCountWorker; | |
| 19 | 18 | import com.lyms.platform.operate.web.worker.MaterDeliverWorker; |
| 20 | 19 | import com.lyms.platform.permission.model.Organization; |
| 21 | 20 | import com.lyms.platform.permission.model.OrganizationQuery; |
| ... | ... | @@ -2214,6 +2213,7 @@ |
| 2214 | 2213 | // 什么都不做，这里是数据传入错误了 |
| 2215 | 2214 | } |
| 2216 | 2215 | } |
| 2216 | + babyModelQuery.setDataStatus(false); | |
| 2217 | 2217 | babyModelQuery.setDeformityKey(newBabyManagerRequest.getDeformityKey()); |
| 2218 | 2218 | babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType()); |
| 2219 | 2219 | babyModelQuery.setParentId(StringUtils.isEmpty(newBabyManagerRequest.getPatientId()) ? null : newBabyManagerRequest.getPatientId()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
e384ec8
| ... | ... | @@ -10,23 +10,19 @@ |
| 10 | 10 | import com.lyms.platform.common.utils.EnumUtil; |
| 11 | 11 | import com.lyms.platform.common.utils.MongoConvertHelper; |
| 12 | 12 | import com.lyms.platform.common.utils.ReflectionUtils; |
| 13 | -import com.lyms.platform.operate.web.facade.AccessPermissionFacade; | |
| 14 | 13 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 15 | 14 | import com.lyms.platform.operate.web.facade.OperateLogFacade; |
| 16 | 15 | import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; |
| 17 | 16 | import com.lyms.platform.operate.web.service.INewbornVisitService; |
| 18 | 17 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| 19 | -import com.lyms.platform.operate.web.utils.FunvCommonUtil; | |
| 20 | 18 | import com.lyms.platform.operate.web.utils.MongoUtil; |
| 21 | 19 | import com.lyms.platform.operate.web.utils.ResponseUtil; |
| 22 | 20 | import com.lyms.platform.permission.dao.master.CouponMapper; |
| 23 | -import com.lyms.platform.permission.dao.slave.OrganizationMapper; | |
| 24 | -import com.lyms.platform.permission.dao.slave.UsersMapper; | |
| 25 | -import com.lyms.platform.permission.model.Users; | |
| 26 | 21 | import com.lyms.platform.permission.service.CouponService; |
| 27 | -import com.lyms.platform.pojo.*; | |
| 28 | -import com.lyms.platform.query.DataPermissionsModelQuery; | |
| 29 | -import com.mongodb.WriteResult; | |
| 22 | +import com.lyms.platform.pojo.BabyModel; | |
| 23 | +import com.lyms.platform.pojo.NewbornVisit; | |
| 24 | +import com.lyms.platform.pojo.Patients; | |
| 25 | +import com.lyms.platform.pojo.PersonModel; | |
| 30 | 26 | import org.apache.commons.collections.map.HashedMap; |
| 31 | 27 | import org.apache.commons.lang.StringUtils; |
| 32 | 28 | import org.springframework.beans.factory.annotation.Autowired; |