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

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/SignFamily.java

@@ -379,6 +379,7 @@ public class SignFamily extends IdEntity {
        this.patientApplyDate = patientApplyDate;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "patient_apply_unsgin_date")
    public Date getPatientApplyUnsignDate() {
        return patientApplyUnsignDate;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/message/MessageDao.java

@@ -23,7 +23,7 @@ public interface MessageDao extends PagingAndSortingRepository<Message, Long>, J
    @Query("select count(1) from Message a where a.type in(1,101) and a.read= 1 and a.receiver=?1 ")
    Integer amountUnreadByReceiver(String doctor);
    @Query("select a from Message a where a.type =1 and a.read= 1 and a.receiver=?1 order by a.czrq desc")
    @Query("select a from Message a where a.type in(1,101) and a.read= 1 and a.receiver=?1 order by a.czrq desc")
    Page<Message> amountUnreadLastByReceiver(String doctor, Pageable pageRequest);
    @Query("select count(1) from Message a where a.type =2 and a.read= 1 and a.receiver=?1 ")
@@ -56,13 +56,13 @@ public interface MessageDao extends PagingAndSortingRepository<Message, Long>, J
    @Query("update Message a set a.read = 0 where a.receiver = ?1 and a.sender=?2 and a.tzType=?3")
    int updateHealthIndexMessageByPatient(String doctor, String patient, String type);
    @Query("select a from Message a where a.read= 1 and a.receiver = ?1 and a.type not in (1,2,6,7,12) order by a.czrq desc")
    @Query("select a from Message a where a.read= 1 and a.receiver = ?1 and a.type not in (1,2,6,7,12,101) order by a.czrq desc")
    List<Message> getSystemMessageUnread(String doctor);
    @Query("select a from Message a where a.receiver = ?1 and a.prescriptionStatus=?2 and a.type in (6,7) order by a.createTime desc")
    List<Message> getSysTemMessageByPrescription(String doctor, String prescriptionStatus);
    @Query("select a from Message a where a.receiver = ?1 and a.type not in (1,2,6,7,12) and (a.del = '1' or a.del is null) ")
    @Query("select a from Message a where a.receiver = ?1 and a.type not in (1,2,6,7,12,101) and (a.del = '1' or a.del is null) ")
    List<Message> getSystemMessage(String doctor, Pageable pageRequest);
    @Query("select a from Message a where a.receiver = ?1 and a.type=?2 and a.prescriptionStatus='0' ")

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -901,7 +901,8 @@ public class DoctorInfoService extends BaseService {
                data.put("remark", remark);
//                data.put("remark", newD.getName() + "健管师将专门为您提供优质健康服务");
            } else {
                remark = remark.replace("key1",newD.getName() + "健管师与" + signFamily.getDoctorName() + "医生一道，");
                remark = remark.replace("key1",newD.getName()==null?"":newD.getName());
                remark = remark.replace("key2",signFamily.getDoctorName()==null?"":signFamily.getDoctorName());
                data.put("remark", remark);
//                data.put("remark", newD.getName() + "健管师与" + signFamily.getDoctorName() + "医生一道，为您提供优质健康服务");
            }
@@ -929,7 +930,7 @@ public class DoctorInfoService extends BaseService {
            } else {
                templateConfig = templateConfigDao.findByScene("template_doctor_change","jgsxzqk");
                remark = templateConfig.getRemark();
                remark.replace("key1",(newD.getName()==null?"":newD.getName())).replace("key2",(signFamily.getDoctorName()==null?"":signFamily.getDoctorName()));
                remark = remark.replace("key1",(newD.getName()==null?"":newD.getName())).replace("key2",(signFamily.getDoctorName()==null?"":signFamily.getDoctorName()));
//                data.put("remark", newD.getName() + "健管师与" + signFamily.getDoctorName() + "医生一道，为您提供优质健康服务");
                data.put("remark", remark);
            }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -115,7 +115,8 @@ public class MessageService extends BaseService {
                    msgJson.put("title", msg.getTitle());
                    msgJson.put("type", msg.getType());
                    if (msg.getSignStatus().equals("4")) {
                        msgJson.put("msg", msg.getSenderName() + "申请与您解除家庭签约");
                        //msgJson.put("msg", msg.getSenderName() + "申请与您解除家庭签约");
                        msgJson.put("msg", "您有一条取消家庭签约消息，请查看。");
                    } else if(msg.getSignStatus().equals("8")){
                        msgJson.put("msg", msg.getSenderName() + "申请与您续签家庭医生");
                    }else{

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -849,6 +849,9 @@ public class FamilyContractService extends BaseService {
        message.setSex(p.getSex());
        message.setOver("1");//未处理
        message.setData(sf.getCode());
        message.setSignStatus("4");
        message.setDel("1");
        message.setState(1);
        messageDao.save(message);
        return 200;
@@ -904,6 +907,9 @@ public class FamilyContractService extends BaseService {
        message.setSex(p.getSex());
        message.setOver("1");//未处理
        message.setData(sf.getCode());
        message.setSignStatus("4");
        message.setDel("1");
        message.setState(1);
        messageDao.save(message);
        return 200;
@@ -3318,7 +3324,7 @@ public class FamilyContractService extends BaseService {
                    "  sp.id labelid, " +
                    " CASE WHEN sp.label_name is null THEN '未标注' WHEN sp.label_name='' THEN '未标注' else sp.label_name END labelname, " +
                    "  sp.label_type labeltype, " +
                    "  p.idcard idcard " +
                    "  p.idcard idcard" +
                    " FROM " +
                    " wlyy_sign_family sf " +
                    " JOIN wlyy_patient p ON sf.patient = p.CODE " +
@@ -4193,7 +4199,7 @@ public class FamilyContractService extends BaseService {
                " f.sick_village_name AS label, " +
                " COUNT(1) AS number " +
                " FROM " +
                " wlyy_sign_family f JOIN wlyy" +
                " wlyy_sign_family f " +
                " WHERE " +
                " f.`status` >= 0 " +
                " AND f.sick_village IS NOT NULL " +

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

@@ -263,10 +263,10 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    JSONObject json = jsonArray.getJSONObject(i);
                    Map info = new HashMap();
                    info.put("code", json.getString("code").toString());
                    info.put("patient", json.getString("code").toString());
                    info.put("name", json.getString("name").toString());
                    info.put("photo",json.getString("photo").toString());
                    info.put("age",json.getString("age").toString());
                    info.put("age",json.getInt("age"));
                    info.put("sex",json.getString("sex").toString());
                    info.put("hasopenid",json.getString("hasopenid").toString());
@@ -274,7 +274,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                }
                int length = codes.size();
                map.put("label", labelName);
                map.put("codes", codes);
                map.put("ps", codes);
                map.put("number", length);
                listNum.add(map);
                count += length;
@@ -287,10 +287,10 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    JSONObject json = noGroup.getJSONObject(i);
                    Map info = new HashMap();
                    info.put("code", json.getString("code").toString());
                    info.put("patient", json.getString("code").toString());
                    info.put("name", json.getString("name").toString());
                    info.put("photo",json.getString("photo").toString());
                    info.put("age",json.getString("age").toString());
                    info.put("age",json.getInt("age"));
                    info.put("sex",json.getString("sex").toString());
                    info.put("hasopenid",json.getString("hasopenid").toString());
@@ -299,7 +299,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                Map map = new HashMap();
                int size = noGroup.length();
                map.put("label", "未标注");
                map.put("codes", codes);
                map.put("ps", codes);
                map.put("number", size);
                listNum.add(map);
                count += size;
@@ -310,6 +310,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            map.put("patients", listNum);
            return write(200, "查询成功", "data", map);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
        }
    }
@@ -1310,7 +1311,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    for (Object patient : jsonArray) {
                        JSONObject jsonObject = new JSONObject(patient.toString());
                        Map<String,Object> p = new HashedMap();
                        p.put("code",jsonObject.get("code").toString());
                        p.put("patient",jsonObject.get("code").toString());
                        p.put("name",jsonObject.get("name").toString());
                        p.put("sex",jsonObject.get("sex").toString());
                        p.put("age",jsonObject.get("age").toString());
@@ -1331,7 +1332,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    for (Object patient : jsonArray) {
                        JSONObject jsonObject = new JSONObject(patient.toString());
                        Map<String,Object> p = new HashedMap();
                        p.put("code",jsonObject.get("code").toString());
                        p.put("patient",jsonObject.get("code").toString());
                        p.put("name",jsonObject.get("name").toString());
                        p.put("sex",jsonObject.get("sex").toString());
                        p.put("age",jsonObject.get("age").toString());
@@ -1354,7 +1355,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    for (Object str : jsonArray) {
                        JSONObject jsonObject = new JSONObject(str.toString());
                        Map<String,Object> p = new HashedMap();
                        p.put("code",jsonObject.get("code").toString());
                        p.put("patient",jsonObject.get("code").toString());
                        p.put("name",jsonObject.get("name").toString());
                        p.put("sex",jsonObject.get("sex").toString());
                        p.put("age",jsonObject.get("age").toString());
@@ -1374,7 +1375,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    for (Object str : jsonArray1) {
                        JSONObject jsonObject = new JSONObject(str.toString());
                        Map<String,Object> p = new HashedMap();
                        p.put("code",jsonObject.get("code").toString());
                        p.put("patient",jsonObject.get("code").toString());
                        p.put("name",jsonObject.get("name").toString());
                        p.put("sex",jsonObject.get("sex").toString());
                        p.put("age",jsonObject.get("age").toString());
@@ -1394,7 +1395,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    for (Object str : jsonArray2) {
                        JSONObject jsonObject = new JSONObject(str.toString());
                        Map<String,Object> p = new HashedMap();
                        p.put("code",jsonObject.get("code").toString());
                        p.put("patient",jsonObject.get("code").toString());
                        p.put("name",jsonObject.get("name").toString());
                        p.put("sex",jsonObject.get("sex").toString());
                        p.put("age",jsonObject.get("age").toString());