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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/im/imController.java

@@ -89,6 +89,8 @@ public class imController extends BaseController {
                String startId = ob.get("start_message_id").toString();
                String endId = ob.get("end_message_id").toString();
                Consult con = consultDao.findTypeByCode(id);
                System.out.println("consult========>"+con);
                System.out.println("consultId========>"+id);
                if (StringUtils.isNotEmpty(createTime)){
                    Date date = sdf.parse(createTime);
                    map.put("create_time",sdf.format(date));

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -39,6 +39,7 @@ import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.web.WeixinBaseController;
import springfox.documentation.spring.web.json.Json;
/**
 * 医生端：家庭签约控制类
@@ -251,7 +252,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                count += length;
            }
            if (list.getJSONArray("未标注")!=null){
            if (list.has("未标注")) {
                JSONArray noGroup = list.getJSONArray("未标注");
                List codes = new ArrayList();
                for (int i = 0; i < noGroup.length(); i++) {
@@ -267,7 +268,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                int size = noGroup.length();
                map.put("label", "未标注");
                map.put("codes", codes);
                map.put("number",size);
                map.put("number", size);
                listNum.add(map);
                count += size;
            }
@@ -1085,7 +1086,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                        Map tempmap = new HashMap();
                        JSONObject jsonObject = new JSONObject(patient.toString());
                        String code = jsonObject.get("code").toString();
                        tempmap.put("code",code);
                        tempmap.put("code", code);
                        codes.add(tempmap);
                    }
                    int length = jsonArray.length();
@@ -1094,6 +1095,23 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    map.put("codes", codes);
                    listNum.add(map);
                }
                if (list.has("未标注")) {
                    JSONArray jsonArray = list.getJSONArray("未标注");
                    List codes = new ArrayList();
                    for (Object patient : jsonArray) {
                        Map tempmap = new HashMap();
                        JSONObject jsonObject = new JSONObject(patient.toString());
                        String code = jsonObject.get("code").toString();
                        tempmap.put("code", code);
                        codes.add(tempmap);
                    }
                    Map map = new HashMap();
                    map.put("label", "未标注");
                    map.put("number", jsonArray.length());
                    map.put("codes", codes);
                    listNum.add(map);
                }
            } else {
                JSONArray jsonArray = list.getJSONArray("孕产妇");
                Map map = new HashMap();
@@ -1102,7 +1120,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                for (Object str : jsonArray) {
                    Map tempmap = new HashMap();
                    Object code = new JSONObject(str.toString()).get("code");
                    tempmap.put("code",code);
                    tempmap.put("code", code);
                    temp.add(tempmap);
                }
                map.put("codes", temp);
@@ -1115,7 +1133,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                for (Object str : jsonArray1) {
                    Map tempmap = new HashMap();
                    Object code = new JSONObject(str.toString()).get("code");
                    tempmap.put("code",code);
                    tempmap.put("code", code);
                    temp1.add(tempmap);
                }
                map1.put("codes", temp1);
@@ -1128,7 +1146,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                for (Object str : jsonArray2) {
                    Map tempmap = new HashMap();
                    Object code = new JSONObject(str.toString()).get("code");
                    tempmap.put("code",code);
                    tempmap.put("code", code);
                    temp2.add(tempmap);
                }
                map2.put("codes", temp2);
@@ -1136,7 +1154,6 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                listNum.add(map2);
            }
            patients.put("count", list.length());
            patients.put("count", signFamily.size());
            patients.put("patients", listNum);
            return write(200, "查询成功！", "data", patients);

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

@@ -66,8 +66,8 @@ admin_token=0a5c5258-8863-4b07-a3f9-88c768528ab4
# 签约到期JOB触发时间
sign_end_job_trigger=0 0 0 * * ?
# 续签提醒JOB触发时间 (每5分钟一次)
sign_again_job_trigger=0 0/1 * * * ?
# 续签提醒JOB触发时间 (每30分钟一次)
sign_again_job_trigger=0 0/30 * * * ?
evaluate_score_job = 59 59 23 * * ?
@@ -139,11 +139,11 @@ fastdfs_file_url=http://172.19.103.54:80/
#-------------------------测试环境配置-------------------------#
## 服务器基本配置
# 服务器基本配置
#server_ip=ehr.yihu.com
#server_port=
#server_domain=wlyy
#server_url=http://ehr.yihu.com/fzwlyy/
#server_url=http://ehr.yihu.com/wlyy/
#
## 上传文件配置
#image_server=http://ehr.yihu.com/res/images/