Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/survey/ManagerQuestionnaireService.java

@@ -23,6 +23,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import springfox.documentation.spring.web.json.Json;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -101,28 +102,44 @@ public class ManagerQuestionnaireService extends BaseService {
//      获取调查对象
        JSONObject surveyTarget = jsonStr.getJSONObject("surveyTarget");
        //            0不限 1男 2女
        int sex = Integer.parseInt(surveyTarget.get("sex").toString());
//        int sex = Integer.parseInt(surveyTarget.get("sex").toString());
        JSONArray sex = surveyTarget.getJSONArray("sex");
        JSONArray disease = surveyTarget.getJSONArray("disease");
        JSONArray service = surveyTarget.getJSONArray("service");
        JSONArray healthCondition = surveyTarget.getJSONArray("healthCondition");
        if (sex != 0) {
            String dimensionCode = surveyDimensionDao.findByName("性别");
            String dimensionDetailCode = getCode();
            SurveyDimensionDetail surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, sex == 1 ? "男" : "女", sex, "性别", 1, surveyCode);
            surveyDimensionDetailDao.save(surveyDimensionDetail);
        int sexList = 0;
        for (Object se :sex) {
            JSONObject sexJson = new JSONObject(se.toString());
            int label = sexJson.getInt("label");
            sexList = label;
            if (label!= 0) {
                String dimensionCode = surveyDimensionDao.findByName("性别");
                String dimensionDetailCode = getCode();
//            SurveyDimensionDetail surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, sex == 1 ? "男" : "女", sex, "性别", 1, surveyCode);
//            modify by wjj 2017.7.24 居民标签更改
                SurveyDimensionDetail surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, sexJson.getString("labelName"), label, "性别", 1, surveyCode);
                surveyDimensionDetailDao.save(surveyDimensionDetail);
//          保存到筛选表
            SurveyFilter surveyFilter = new SurveyFilter(getCode(), surveyCode, dimensionDetailCode);
            surveyFilterDao.save(surveyFilter);
                SurveyFilter surveyFilter = new SurveyFilter(getCode(), surveyCode, dimensionDetailCode);
                surveyFilterDao.save(surveyFilter);
            }
        }
        List servList = new ArrayList();
        for (Object serv : service) {
            if ("0".equals(serv.toString())) {
            JSONObject servJson = new JSONObject(serv.toString());
            int label = servJson.getInt("label");
            servList.add(label);
            if (label ==0) {
                break;
            } else {
//                       ===================================
                String dimensionCode = surveyDimensionDao.findByName("服务类型");
                String dimensionDetailCode = getCode();
                SurveyDimensionDetail surveyDimensionDetail = null;
                switch (Integer.parseInt(serv.toString())) {
                surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, servJson.getString("labelName"), label, "服务类型", 3, surveyCode);
               /* switch (Integer.parseInt(serv.toString())) {
//                1.普通人群 2.慢病人群 3.65岁以上人群
                    case 1:
                        surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, "普通人群", 1, "服务类型", 3, surveyCode);
@@ -134,22 +151,29 @@ public class ManagerQuestionnaireService extends BaseService {
                        surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, "65岁以上人群", 3, "服务类型", 3, surveyCode);
                        break;
                }
*/
                surveyDimensionDetailDao.save(surveyDimensionDetail);
                SurveyFilter surveyFilter = new SurveyFilter(getCode(), surveyCode, dimensionDetailCode);
                surveyFilterDao.save(surveyFilter);
            }
        }
        List healthList = new ArrayList();
        for (Object health : healthCondition) {
            if ("0".equals(health.toString())) {
            JSONObject healthJson = new JSONObject(health.toString());
            int label = healthJson.getInt("label");
            healthList.add(label);
            if (label ==0) {
                break;
            } else {
                String dimensionCode = surveyDimensionDao.findByName("健康状况");
                String dimensionDetailCode = getCode();
                String surveyFilterCode = getCode();
                SurveyDimensionDetail surveyDimensionDetail = null;
                switch (Integer.parseInt(health.toString())) {
                surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode,healthJson.getString("labelName") , label, "健康状况", 4, surveyCode);
                /*switch (Integer.parseInt(health.toString())) {
//                1.健康人群 2.患病人群 3.高危人群 4.恢复期人群
                    case 1:
                        surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, "健康人群", 1, "健康状况", 4, surveyCode);
@@ -163,7 +187,7 @@ public class ManagerQuestionnaireService extends BaseService {
                    case 4:
                        surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, "恢复期人群", 4, "健康状况", 4, surveyCode);
                        break;
                }
                }*/
                surveyDimensionDetailDao.save(surveyDimensionDetail);
                SurveyFilter surveyFilter = new SurveyFilter(surveyFilterCode, surveyCode, dimensionDetailCode);
@@ -171,15 +195,22 @@ public class ManagerQuestionnaireService extends BaseService {
            }
        }
        List diseaList = new ArrayList();
        for (Object disea : disease) {
            if ("0".equals(disea.toString())) {
            JSONObject diseaJson = new JSONObject(disea.toString());
            int label = diseaJson.getInt("label");
            diseaList.add(label);
            if (label ==0) {
//                dise += ",";
                break;
            } else {
                String dimensionCode = surveyDimensionDao.findByName("疾病类型");
                String dimensionDetailCode = getCode();
                SurveyDimensionDetail surveyDimensionDetail = null;
                switch (Integer.parseInt(disea.toString())) {
                surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode,diseaJson.getString("labelName") , label, "疾病类型", 2, surveyCode);
                /*switch (Integer.parseInt(disea.toString())) {
//                  1.高血压 2糖尿病 3.高血压+糖尿病
                    case 1:
                        surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, "高血压", 1, "疾病类型", 2, surveyCode);
@@ -187,14 +218,20 @@ public class ManagerQuestionnaireService extends BaseService {
                    case 2:
                        surveyDimensionDetail = new SurveyDimensionDetail(dimensionDetailCode, dimensionCode, "糖尿病", 2, "疾病类型", 2, surveyCode);
                        break;
                }
                }*/
                surveyDimensionDetailDao.save(surveyDimensionDetail);
                SurveyFilter surveyFilter = new SurveyFilter(getCode(), surveyCode, dimensionDetailCode);
                surveyFilterDao.save(surveyFilter);
            }
        }
        List<String> codes = getCount(surveyTarget.toString());
//        List<String> codes = getCount(surveyTarget.toString());
        JSONObject countJson = new JSONObject();
        countJson.put("sex",sexList);
        countJson.put("disease",diseaList);
        countJson.put("healthCondition",healthList);
        countJson.put("service",servList);
        List<String> codes = getCount(countJson.toString());
        int amount = codes.size();
        for (String code : codes) {
//            String code = patient.get("patient").toString();
@@ -1441,8 +1478,8 @@ public class ManagerQuestionnaireService extends BaseService {
//        居民标签类型 2健康人群 3疾病类型
        int lableType = 0;
        Map<String, Object> map = new HashMap<>();
        String sql = " SELECT DISTINCT t.label_name ,t.label " +
                " from wlyy_sign_patient_label_info t " +
        String sql = " SELECT DISTINCT t.label_name ,t.label_code " +
                " from wlyy_sign_patient_label t " +
                " where t.label_type = ?";
        List<Map<String, Object>> health = jdbcTemplate.queryForList(sql, 2);
        List<Map<String, Object>> disea = jdbcTemplate.queryForList(sql, 3);
@@ -1454,7 +1491,7 @@ public class ManagerQuestionnaireService extends BaseService {
        for (Map<String, Object> li : health) {
            Map<String, Object> map1 = new HashMap<>();
            String labelName = li.get("label_name").toString();
            int label = Integer.parseInt(li.get("label").toString());
            int label = Integer.parseInt(li.get("label_code").toString());
            map1.put("label", label);
            map1.put("labelName", labelName);
            healthCodition.add(map1);
@@ -1463,7 +1500,7 @@ public class ManagerQuestionnaireService extends BaseService {
        for (Map<String, Object> li : disea) {
            Map<String, Object> map1 = new HashMap<>();
            String labelName = li.get("label_name").toString();
            int label = Integer.parseInt(li.get("label").toString());
            int label = Integer.parseInt(li.get("label_code").toString());
            map1.put("label", label);
            map1.put("labelName", labelName);
            disease.add(map1);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/survey/ManagerQuestionnaireController.java

@@ -541,7 +541,6 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
            @ApiParam(value = "筛选条件")
            @RequestParam String json) {
        try {
            json = "{\"sex\":1,\"disease\":[1],\"healthCondition\":[1,2,3],\"service\":[1,2]}";
            int amount = managerQuestionnaireService.getAmount(json);
            return write(200, "查询成功！", "amount", amount);
        } catch (Exception e) {

patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -228,6 +228,25 @@ public class WeiXinEventProcess {
        articleExamination.put("Description", "社区体检");
        articleExamination.put("PicUrl", examination_pic);
        articles.add(articleExamination);
//        新增处方记录图文消息
        Map<String, String> articlePrescription = new HashMap<>();
        // 图文URL
        String prescription = systemConf.getProperty("patient_prescription_url");
        // 图文消息图片URL
        String prescription_pic = systemConf.getProperty("patient_prescription_pic");
        // URL设置服务器URL、AppId
        examination = examination.replace("{server}", systemConf.getProperty("wechat_base_url"))
                .replace("{appId}", systemConf.getProperty("appId"));
        //图片地址
        prescription_pic = examination_pic.replace("{server}", systemConf.getProperty("server_url"));
        articleExamination.put("Url", prescription);
        articleExamination.put("Title", "处方记录");
        articleExamination.put("Description", "处方记录");
        articleExamination.put("PicUrl", prescription_pic);
        articles.add(articlePrescription);
        // 构建回复消息XML
        result = WeiXinMessageReplyUtils.replyNewsMessage(message.get("FromUserName"), message.get("ToUserName"), articles);

patient-co-wlyy/src/main/resources/system.properties

@@ -24,6 +24,8 @@ patient_visit_url = https://open.weixin.qq.com/connect/oauth2/authorize?appid={a
patient_inspect_url =https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjianchajianyan.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
#社区体检
patient_examination_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiankangtijian.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
#处方记录
patient_prescription_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiankangtijian.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
#就诊记录
patient_visit_pic ={server}/images/visit.png
@@ -31,6 +33,8 @@ patient_visit_pic ={server}/images/visit.png
patient_inspect_pic ={server}/images/inspect.png
#社区体检
patient_examination_pic={server}/images/examination.png
#处方记录
patient_prescription_pic={server}/images/prescriptionRecords.png
patient_operatinginstrutions_pic_url={server}/images/operatinginstructions.png
patient_booking_pic_url={server}/images/booking.png