diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java index 5e1c542..2def1e6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java @@ -20,6 +20,8 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ private String id; private String hospitalId; + private String caiyangyunzhou; + private String number; //冗余lyms_sieve表id @@ -60,6 +62,14 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ this.hospitalId = hospitalId; } + public String getCaiyangyunzhou() { + return caiyangyunzhou; + } + + public void setCaiyangyunzhou(String caiyangyunzhou) { + this.caiyangyunzhou = caiyangyunzhou; + } + public String getId() { return id; } @@ -96,6 +106,9 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ if(null!=hospitalId){ condition= condition.and("hospitalId",hospitalId, MongoOper.IS); } + if(null!=caiyangyunzhou){ + condition= condition.and("caiyangyunzhou",caiyangyunzhou, MongoOper.IS); + } if(null!=sieveHospitalId){ condition= condition.and("sieveHospitalId",sieveHospitalId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 53bbb00..7402429 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -180,6 +180,8 @@ public class TestController extends BaseController { @Autowired private MatDeliverFacade matDeliverFacade; + @Autowired + private ApplyOrderFacade applyOrderFacade; static Map highRisks = new HashMap<>(); @@ -202,6 +204,41 @@ public class TestController extends BaseController { highRisks.put("4ec114d7-9c78-4dfc-878c-1139ef3ff04c", "5a40c73c422b03d4ad2bf7bf"); //骨盆狭窄或产道畸形,--- 生殖道畸形和骨盆狭小 highRisks.put("3af4b6fd-0bb9-4f4b-9d8f-916df71955cf", "5a430fe4422b03d4ad2bf82b"); //胸廓畸形伴轻度肺功能不全---- 胸廓畸形等伴轻度肺功能不全 } + /** + * 功能描述 衡水线上修改采样孕周数据问题 + * @author 武涛涛 + * @date 2020/7/13 + */ + @RequestMapping(method = RequestMethod.GET, value = "/updateSieveApplyOrder") + @ResponseBody + //增加产筛申请单 + public BaseResponse updateSieveApplyOrder(@RequestParam(required = false) String number, + @RequestParam(required = false) String hospitalId) { + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setNumber(number); + sieveApplyOrderQuery1.setCaiyangyunzhou("孕0周+0天"); + sieveApplyOrderQuery1.setHospitalId(hospitalId); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + Integer integer1 = 0; + List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + for (int i = 0; i