From 48e3ed3ea0f7ba120457642b2e45fb2037405582 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 5 Jan 2021 18:22:58 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/pojo/BabyModel.java     | 12 +++++++++++
 .../com/lyms/platform/query/BabyModelQuery.java    | 12 +++++++++++
 .../operate/web/controller/TestController.java     | 22 ++++++++++++++++++++
 .../operate/web/facade/BabyBookbuildingFacade.java | 24 ++++++++++++++++++++++
 4 files changed, 70 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index 8b9c120..4170bf0 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -568,7 +568,19 @@ public class BabyModel extends BaseModel {
     private String openDisease;
     private Date openDiseaseEndTime;
 
+
+
     private String openDiseaseType; //1一个月  12一年
+    //高危儿童唯一编号 根据年来分配
+    private Long riskCode;
+
+    public Long getRiskCode() {
+        return riskCode;
+    }
+
+    public void setRiskCode(Long riskCode) {
+        this.riskCode = riskCode;
+    }
 
     public String getOpenDiseaseType() {
         return openDiseaseType;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 459f764..c654ab0 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -1214,7 +1214,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     public void setHasBlno(Boolean hasBlno) {
         this.hasBlno = hasBlno;
     }
+    private Long riskCode;
 
+    public Long getRiskCode() {
+        return riskCode;
+    }
+
+    public void setRiskCode(Long riskCode) {
+        this.riskCode = riskCode;
+    }
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
@@ -1329,6 +1337,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != dueWeek) {
             condition = condition.and("dueWeek", dueWeek, MongoOper.LTE);
         }
+
+        if (null != riskCode) {
+            condition = condition.and("riskCode", true, MongoOper.EXISTS);
+        }
         if (StringUtils.isNotEmpty(openDisease)) {
             if ("2".equals(openDisease))
             {
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 28c927b..e48bb5b 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
@@ -4183,6 +4183,28 @@ public class TestController extends BaseController {
         return "syncPatFirstTime finish";
     }
 
+    @RequestMapping(value = "/getRiksCode", method = RequestMethod.GET)
+    @ResponseBody
+    public synchronized Long getRiksCode(String hospitalId)
+    {
+        Long result = Long.valueOf(DateUtil.getYearStr()+"0001");
+        BabyModelQuery babyQuery = new BabyModelQuery();
+        babyQuery.setHospitalId(hospitalId);
+        babyQuery.setRiskCode(1L);
+        babyQuery.setNeed("true");
+        babyQuery.setPage(1);
+        babyQuery.setLimit(1);
+        babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
+        List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+        if (CollectionUtils.isNotEmpty(models))
+        {
+            if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYearStr()))
+            {
+                return models.get(0).getRiskCode()+1;
+            }
+        }
+        return result;
+    }
 
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 3023dfd..c777596 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -877,6 +877,8 @@ public class BabyBookbuildingFacade {
             getNumberCode(model);
             operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档");
             model.setEndCase(0);//秦皇岛，默认未结案
+
+            //setRiksCode(model);
             model = babyBookbuildingService.addBabyBookbuilding(model);
 
 
@@ -935,6 +937,28 @@ public class BabyBookbuildingFacade {
         return br;
     }
 
+
+    public synchronized void setRiksCode(BabyModel model)
+    {
+        Long result = Long.valueOf(DateUtil.getYmd()+"0001");
+        BabyModelQuery babyQuery = new BabyModelQuery();
+        babyQuery.setHospitalId(model.getHospitalId());
+        babyQuery.setNeed("true");
+        babyQuery.setPage(1);
+        babyQuery.setLimit(1);
+        babyQuery.setRiskCode(1L);
+        babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
+        List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+        if (CollectionUtils.isNotEmpty(models))
+        {
+            if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYmd()))
+            {
+                result = models.get(0).getRiskCode()+1;
+            }
+        }
+        model.setRiskCode(result);
+    }
+
     /**
      * 眼保健保存建档时候，保存听力产筛档案
      *
-- 
1.8.3.1