From 954b2c2f89dd771edfc2d32baaec9b737abf013a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 22 Mar 2018 14:30:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=B5=8B=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/master/MasterOrganizationMapper.java       |  2 +
 .../permission/service/OrganizationService.java    |  2 +
 .../service/impl/OrganizationServiceImpl.java      |  5 ++
 .../mainOrm/master/MasterOrganization.xml          | 11 ++++
 .../web/controller/MeasureInfoController.java      |  2 +-
 .../operate/web/facade/BookbuildingFacade.java     | 11 ++--
 .../operate/web/facade/MeasureInfoFacade.java      | 72 +++++++++++++++++-----
 .../operate/web/request/MeasureInfoRequest.java    | 15 ++++-
 8 files changed, 97 insertions(+), 23 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java
index a673091..4b4a088 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java
@@ -26,4 +26,6 @@ public interface MasterOrganizationMapper {
     void execSql(String sql);
 
     List<Map<String,Object>> getOrganizationByAreaId(String id);
+
+    List<Organization> queryHospitalIds(OrganizationQuery organizationQuery);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
index 5070940..0979841 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
@@ -24,6 +24,8 @@ public interface OrganizationService {
 
     List<Organization> queryHospitals(OrganizationQuery organizationQuery);
 
+    List<Organization> queryHospitalIds(OrganizationQuery organizationQuery);
+
     /**
      * 维护用户机构权限为最新状态，机构新增、修改、删除时执行；用户新增、修改、删除时执行
      */
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index 38c431a..6838d70 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -233,6 +233,11 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
         return results;
     }
 
+    @Override
+    public List<Organization> queryHospitalIds(OrganizationQuery organizationQuery) {
+        return masterOrganizationMapper.queryHospitalIds(organizationQuery);
+    }
+
     /**
      * 维护用户机构权限为最新状态，机构新增、修改、删除时执行；用户新增、修改、删除时执行
      */
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
index a3a5b1f..31a261b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
@@ -225,6 +225,17 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
     </select>
 
 
+
+    <select id="queryHospitalIds" resultMap="OrganizationResultMap"
+            parameterType="com.lyms.platform.permission.model.OrganizationQuery">
+        select
+        id
+        from organization
+        <include refid="OrganizationCondition"/>
+        <include refid="orderAndLimit"/>
+    </select>
+
+
     <select id="queryOrganizationCount" resultType="int"
             parameterType="com.lyms.platform.permission.model.OrganizationQuery">
         select count(1) from organization
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
index d31d457..450cee6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
@@ -28,7 +28,7 @@ public class MeasureInfoController extends BaseController {
     private MeasureInfoFacade measureInfoFacade;
     /**
      * 血糖和脉搏 身高和体重的值列表
-     * valueType 值类型： 1 体重和身高 2 血压和脉搏 3 体温
+     * valueType 值类型： 1 体重和身高 2 血压和脉搏 3 体温 4血糖
      * @return
      */
     @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureInfoList")
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 51987eb..58d72f7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -889,17 +889,16 @@ public class BookbuildingFacade {
         if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) {
             patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo());
 
-
-            //线上唐山区域查询的时候只查询唐山医院的已有建档记录
+            //只查询当前医院所在市的所有建档记录
             Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
             List<String> hids = new ArrayList<>();
-            if (org != null && "4".equals(org.getCityId()) && "1".equals(org.getProvinceId()))
+            if (org != null)
             {
                 OrganizationQuery query = new OrganizationQuery();
                 query.setYn(YnEnums.YES.getId());
-                query.setCityId("4");
-                query.setProvinceId("1");
-                List<Organization> list = organizationService.queryOrganization(query);
+                query.setCityId(org.getCityId());
+                query.setProvinceId(org.getProvinceId());
+                List<Organization> list = organizationService.queryHospitalIds(query);
                 if (CollectionUtils.isNotEmpty(list))
                 {
                     for (Organization organization : list) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index 18b2c9a..ada460d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -54,6 +54,8 @@ public class MeasureInfoFacade {
     @Autowired
     private BasicConfigService basicConfigService;
 
+    private static String[] blood_item = new String[]{"--","--","--","--","--","--","--","--","--"};
+
     private static final Integer MAX_TODAY_COUNT = 5;
 
     public BaseListResponse queryMeasureInfoList(String queryNo,
@@ -246,23 +248,39 @@ public class MeasureInfoFacade {
 
             if (CollectionUtils.isNotEmpty(list)) {
                 MeasureDataInfoModel measureDataInfoModel = list.get(0);
-                if (DateUtil.getyyyy_MM_dd(measureDataInfoModel.getModified()).equals(DateUtil.getyyyy_MM_dd(new Date()))) {
-                    todayCount = measureDataInfoModel.getTodayCount() + 1;
-                    if (todayCount > MAX_TODAY_COUNT) {
-                        baseResponse.setData(-1);
-                        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
-                        baseResponse.setErrormsg("成功");
-                        return baseResponse;
+                if (measureDataInfoModel.getValueType() == 4)
+                {
+                    if (DateUtil.getyyyy_MM_dd(measureDataInfoModel.getModified()).equals(DateUtil.getyyyy_MM_dd(new Date()))) {
+                        todayCount = measureDataInfoModel.getTodayCount() + 1;
+                        String[] items = measureDataInfoModel.getValueOne().split("/");
+                        dataInfoModel.setValueOne(getBloodSugar(items,measureInfoRequest.getRemarkValue(), measureInfoRequest.getValueOne()));
+                    }
+                    else
+                    {
+                        dataInfoModel.setValueOne(getBloodSugar(blood_item,measureInfoRequest.getRemarkValue(), measureInfoRequest.getValueOne()));
+                        todayCount = 1;
                     }
                     dataInfoModel.setTodayCount(todayCount);
-
-                    dataInfoModel.setRecordContent((StringUtils.isEmpty(measureDataInfoModel.getRecordContent()) ? "" : measureDataInfoModel.getRecordContent()+ "," ) + measureInfoRequest.getValueOne());
                 }
                 else
                 {
-                    todayCount = 1;
-                    dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
-                    dataInfoModel.setTodayCount(todayCount);
+                    if (DateUtil.getyyyy_MM_dd(measureDataInfoModel.getModified()).equals(DateUtil.getyyyy_MM_dd(new Date()))) {
+                        todayCount = measureDataInfoModel.getTodayCount() + 1;
+                        if (todayCount > MAX_TODAY_COUNT) {
+                            baseResponse.setData(-1);
+                            baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+                            baseResponse.setErrormsg("成功");
+                            return baseResponse;
+                        }
+                        dataInfoModel.setTodayCount(todayCount);
+                        dataInfoModel.setRecordContent((StringUtils.isEmpty(measureDataInfoModel.getRecordContent()) ? "" : measureDataInfoModel.getRecordContent()+ "," ) + measureInfoRequest.getValueOne());
+                    }
+                    else
+                    {
+                        todayCount = 1;
+                        dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
+                        dataInfoModel.setTodayCount(todayCount);
+                    }
                 }
 
                 dataInfoModel.setModified(new Date());
@@ -285,10 +303,16 @@ public class MeasureInfoFacade {
                     dataInfoModel.setTodayCount(todayCount);
                     dataInfoModel.setRecordCount(1);
                     dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
+
+                    //血糖
+                    if (measureInfoRequest.getValueType() == 4 && measureInfoRequest.getRemarkValue() != null)
+                    {
+                        dataInfoModel.setValueOne(getBloodSugar(blood_item,measureInfoRequest.getRemarkValue(), measureInfoRequest.getValueOne()));
+                    }
+
                     mysqlMeasureDataInfoService.addMeasureDataInfo(dataInfoModel);
                 }
-                else
-                {
+                else {
                     baseResponse.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS);
                     baseResponse.setErrormsg("您还没有录入基本信息，暂时不能测量");
                     return baseResponse;
@@ -343,10 +367,30 @@ public class MeasureInfoFacade {
         model.setValueOne(measureInfoRequest.getValueOne());
         model.setValueTwo(measureInfoRequest.getValueTwo());
         model.setValueType(measureInfoRequest.getValueType());
+        model.setRemarkValue(measureInfoRequest.getRemarkValue());
         return model;
     }
 
 
+    private String getBloodSugar(String[] blood_item ,String remarkValue,String valueOne)
+    {
+        if (remarkValue != null)
+        {
+            blood_item[Integer.parseInt(remarkValue)-1] = valueOne;
+
+            StringBuffer sb = new StringBuffer();
+
+            for (int i = 0 ; i < blood_item.length ; i++)
+            {
+                sb.append(blood_item[i]+(i == (blood_item.length-1) ? "" :"/"));
+            }
+            return sb.toString();
+        }
+        return valueOne;
+    }
+
+
+
     /**
      * 添加测量人基本信息
      * @param measureInfoRequest
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
index 1ab66ae..7a2591e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
@@ -16,14 +16,14 @@ public class MeasureInfoRequest {
     private  Integer sex;
     //就诊卡号
     private  String vcCardNo;
-    //血压/体重
+    //血压/体重/血糖
     private  String valueOne;
     //脉搏/身高
     private  String valueTwo;
     //体重测量存BMI值
     private  String valueThree;
 
-    //值类型： 1 体重和身高 2 血压和脉搏 3、体温
+    //值类型： 1 体重和身高 2 血压和脉搏 3、体温 4、血糖
     private  Integer valueType;
 
     //医院id
@@ -53,6 +53,17 @@ public class MeasureInfoRequest {
     //户籍地址
     private String address;
 
+    //"空腹"1, "早餐前"2, "早餐后"3, "午餐前"4, "午餐后"5, "晚餐前"6, "晚餐后"7,"夜间"8,"睡前"9
+    private String remarkValue;
+
+    public String getRemarkValue() {
+        return remarkValue;
+    }
+
+    public void setRemarkValue(String remarkValue) {
+        this.remarkValue = remarkValue;
+    }
+
     public String getAddress() {
         return address;
     }
-- 
1.8.3.1