Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/desizenMan/service_project_management.jsp

@@ -175,7 +175,7 @@
                        <input class="uploadfile" type="file" value="选择" onchange="auploadFile(event)">
                        <button>选择</button>
                    </div>
                    <a href="">模板下载</a>
                    <a href="${ctx}/static/desizenMan/Sheet1.xls" target="_blank">模板下载</a>
                    <p>请核对导入数据，若导入项目信息已存在，将会更新项目表中的数据。</p>
                    <div class="lay-button">
                        <button onclick="submitFile(this)">确认</button>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

@@ -232,7 +232,7 @@
                    <input class="uploadfile" type="file" value="选择" onchange="auploadFile(event)">
                    <button>选择</button>
                </div>
                <a href="">模板下载</a>
                <a href="${ctx}/static/specialty/Sheet1.xls" target="_blank">模板下载</a>
                <p>请核对导入数据，若导入项目信息已存在，将会更新项目表中的数据。</p>
                <div class="lay-button">
                    <button onclick="submitFile(this)">确认</button>

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistEvaluateSevice.java

@@ -205,7 +205,11 @@ public class SpecialistEvaluateSevice extends BaseService {
                message.setOver("1");//未处理
                message.setType(20);
                message.setTitle("康复计划-待办工作提醒");
                message.setContent("您的"+patient.getName()+"签约居民"+num+"天后计划到"+(hospital!=null?hospital.getName():"")+"复诊，请查看");
                if(num==0){
                    message.setContent("您的"+patient.getName()+"签约居民今天计划到"+(hospital!=null?hospital.getName():"")+"复诊，请查看");
                }else{
                    message.setContent("您的"+patient.getName()+"签约居民"+num+"天后计划到"+(hospital!=null?hospital.getName():"")+"复诊，请查看");
                }
            }else if (message.getType() == 21){
                message.setOver("0");//未处理
                message.setType(21);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationManageService.java

@@ -356,7 +356,10 @@ public class RehabilitationManageService extends BaseService {
            json.put("patientName",patientName);
            json.put("age",age);
            json.put("sex",sex);
            json.put("healthyCondition","康复期");
            String healthyConditionSql =" select  label_name from wlyy_sign_patient_label_info where status=1 and patient='"+patientCode+"' and label_type=8";
            List<Map<String,Object>> healthyConditionList = jdbcTemplate.queryForList(healthyConditionSql);
            String healthyCondition = healthyConditionList.size()>0?healthyConditionList.get(0).get("label_name")+"":"";
            json.put("healthyCondition",healthyCondition);
            json.put("signHospitalName",signHospitalName);
            Patient patient = patientDao.findByCode(patientCode);
            json.put("photo",patient.getPhoto());
@@ -656,6 +659,10 @@ public class RehabilitationManageService extends BaseService {
            json.put("patientPhoto",p.getPhoto());
            json.put("patientName",p.getName());
            json.put("patientCode",p.getCode());
            String healthyConditionSql =" select  label_name from wlyy_sign_patient_label_info where status=1 and patient='"+p.getCode()+"' and label_type=8";
            List<Map<String,Object>> healthyConditionList = jdbcTemplate.queryForList(healthyConditionSql);
            String healthyCondition = healthyConditionList.size()>0?healthyConditionList.get(0).get("label_name")+"":"";
            json.put("healthyCondition",healthyCondition);
            return json;
        }
        throw new Exception("请求微服务失败！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationPlanService.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashSet;
import java.util.Map;
/**
@@ -134,7 +135,7 @@ public class RehabilitationPlanService extends BaseService {
        return rs.getString("message");
    }
    public String createRehabilitationPlan(String json, Doctor doctor) {
    public String createRehabilitationPlan(String json, Doctor doctor) throws Exception {
        JSONObject object = new JSONObject(json);
        String patient = object.getString("patient");
        object.put("createUser", doctor.getCode());
@@ -148,18 +149,26 @@ public class RehabilitationPlanService extends BaseService {
            e.printStackTrace();
        }
        JSONObject rs = new JSONObject(response.getContent());
        JSONArray detailModelList = (JSONArray) rs.get("detailModelList");
        //康复计划创建完给执行者发送消息
        for (Object obj : detailModelList){
            JSONObject detail = (JSONObject) obj;
            Message message = new Message();
            message.setSender(doctor.getCode());
            message.setType(19);
            message.setRelationCode(detail.getString("planId"));
            message.setReceiver(detail.getString("doctor"));
            specialistEvaluateSevice.sendMessage(message, detail.getString("hospital"), patient,null);
        if(rs.getInt("status") == 200) {
            HashSet set = new HashSet();
            JSONArray detailModelList = (JSONArray) rs.get("detailModelList");
            //康复计划创建完给执行者发送消息
            for (Object obj : detailModelList) {
                JSONObject detail = (JSONObject) obj;
                if (!set.contains(detail.getString("doctor"))) {
                    set.add(detail.getString("doctor"));
                    Message message = new Message();
                    message.setSender(doctor.getCode());
                    message.setType(19);
                    message.setRelationCode(detail.getString("planId"));
                    message.setReceiver(detail.getString("doctor"));
                    specialistEvaluateSevice.sendMessage(message, detail.getString("hospital"), patient, null);
                }
            }
            return rs.getString("message");
        }else {
            throw new Exception("请求微服务失败！");
        }
        return rs.getString("message");
    }
    public String deleteTemplate(String templateId) {

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -189,8 +189,8 @@ es:
jkEdu:
  web:
#    articleBaseUrl: http://yihu.com:9088/
    articleBaseUrl: http://172.19.103.78:9092/
#    articleBaseUrl: http://172.19.103.87:9088/
#    articleBaseUrl: http://172.19.103.78:9092/
    articleBaseUrl: http://172.19.103.87:9088/
#消息队列
activemq:

patient-co/patient-co-wlyy/src/main/resources/wechat/weixin_menu.txt

@@ -55,9 +55,9 @@
        	    "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fjkjf%2fhtml%2funopened.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
         },
         {
                "type":"view",
                "type":"click",
                "name":"用户指南",
                "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fjtgx%2fhtml%2ffamily.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
                "key":"caozuoshuoming"
         }
	 ]
  }