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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/LoginController.java

@@ -111,7 +111,7 @@ public class LoginController extends BaseController {
            req.getSession().setAttribute("token", featureUrlList);
            //根据用户类型，获取跳转的url
            String url = userService.getValueByDictId(curUser.getType() + "");
//            resp.sendRedirect(req.getContextPath()+"/admin/main");
            resp.sendRedirect(req.getContextPath()+"/admin/main");
            resp.sendRedirect(url);
        }
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/device/DeviceHealthIndexController.java

@@ -112,7 +112,7 @@ public class DeviceHealthIndexController extends BaseController{
    
    public void addHeader(WritableSheet ws) throws WriteException {
        
        String[] header = {"居民姓名","手机号","身份证","设备码","设备名称","签约医生", "地址"};
        String[] header = {"居民姓名","手机号","身份证","设备码","设备名称","签约医生", "地址", "更新日期", "总记录数"};
        int i = 0;
        for (String h : header) {
            addCell(ws, 0, i, h);//表名，行，列，header
@@ -144,6 +144,8 @@ public class DeviceHealthIndexController extends BaseController{
                addCell(ws, i, 4, m.getDevice_name(),"");
                addCell(ws, i, 5, m.getDoctor_name(),"");
                addCell(ws, i, 6, m.getAddress(),"");
                addCell(ws, i, 7, m.getRecord_date(),"");
                addCell(ws, i, 8, m.getAmount(),"");
                i++;
            }
            wwb.write();

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/sign/SignFamilyController.java

@@ -7,12 +7,15 @@ import com.yihu.wlyy.entity.SignFamily;
import com.yihu.wlyy.entity.WlyyAdminTeamMember;
import com.yihu.wlyy.service.manager.sign.SignFamilyService;
import com.yihu.wlyy.service.manager.team.WlyyAdminTeamMemberService;
import com.yihu.wlyy.service.manager.team.WlyyAdminTeamService;
import com.yihu.wlyy.util.HttpClientUtil;
import io.swagger.annotations.ApiParam;
import jxl.Workbook;
import jxl.write.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -30,11 +33,15 @@ import java.util.Map;
@Controller
@RequestMapping(value="admin/sign")
public class SignFamilyController extends BaseController {
    @Value("${reservation.zyurl}")
    private String baseUrl;
    @Autowired
    private SignFamilyService signFamilyService;
    @Autowired
    private WlyyAdminTeamMemberService teamMemberService;
    @Autowired
    private HttpClientUtil httpClientUtil;
    //签约居民管理*******************************
    @RequestMapping(value = "initial", method = RequestMethod.GET)
@@ -232,4 +239,26 @@ public class SignFamilyController extends BaseController {
        }
        ws.addCell(label);
    }
    @RequestMapping(value = "reservation/{patient}",method = RequestMethod.GET)
    public String infoReservation(@PathVariable(value = "patient") String patient){
        return "sign/sign_reservation_modify";
    }
    @RequestMapping(value = "reservationInfo/{patient}")
    @ResponseBody
    public String getReservation(@PathVariable(value = "patient")String patient){
        try {
            String url = baseUrl + "/third/guahao/GetRegList";
            patient = "275f6e8c54874595bd92d8ac255535c4";
            List<NameValuePair> params = new ArrayList<>();
            params.add(new BasicNameValuePair("patient", patient));
            String response = httpClientUtil.post(url, params, "UTF-8");
            return write(200,"success","data",response);
        }catch (Exception e){
            error(e);
            return error(-1,"操作失败！");
        }
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/entity/DeviceHealthIndexExportVO.java

@@ -15,7 +15,8 @@ public class DeviceHealthIndexExportVO {
	private String statusName;
	private String doctor_name;
	private String address;
	
	private String amount;
	public String getPatient() {
		return patient;
	}
@@ -95,4 +96,12 @@ public class DeviceHealthIndexExportVO {
	public void setDevice_name(String device_name) {
		this.device_name = device_name;
	}
	public String getAmount() {
		return amount;
	}
	public void setAmount(String amount) {
		this.amount = amount;
	}
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceHealthIndexService.java

@@ -431,7 +431,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
       return patientDao.findByCode(patientCode);
    }
	
	public List<DeviceHealthIndexExportVO> exportDeviceHealthIndexList(String town, String hospital) {
	/*public List<DeviceHealthIndexExportVO> exportDeviceHealthIndexList(String town, String hospital) {
        List<DeviceHealthIndexExportVO> list = new ArrayList<>();
        String sql  = "SELECT " +
                "s.patient," +
@@ -446,6 +446,35 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
                "SELECT `user`,device_sn,type,max(record_date) record_date FROM device.wlyy_patient_health_index WHERE device_sn IS NOT NULL AND del=1 GROUP BY `user`,device_sn,type) d WHERE s.patient=d.`user` AND s.hospital='"+hospital+"' AND s.`status`> 0) ORDER BY patient";
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(DeviceHealthIndexExportVO.class));
        return list ;
	}*/
    /**
     * 导出体征上传明细
     * @param town
     * @param hospital
     * @return
     */
    public List<DeviceHealthIndexExportVO> exportDeviceHealthIndexList(String town, String hospital) {
        List<DeviceHealthIndexExportVO> list = new ArrayList<>();
        String sql  = "SELECT " +
                "s.patient," +
                "s.`name`," +
                "s.mobile," +
                "s.idcard," +
                "d.device_sn," +
                "d.device_name," +
                "d.record_date," +
                "d.amount,"+
                "CASE d.type WHEN 1 THEN '血糖' WHEN 2 THEN '血压' WHEN 3 THEN '体重' WHEN 4 THEN '腰围' END statusName,"+
                "s.doctor_name," +
                "p.address FROM wlyy_sign_family s,wlyy_patient p,(" +
                "SELECT i.`user`,i.device_sn, i.type, max(i.record_date) record_date, count(i.id) amount, w.device_name " +
                "FROM device.wlyy_patient_health_index i,wlyy_patient_device w "+
                "WHERE i.device_sn = w.device_sn AND i.del=1 GROUP BY i.`user`,i.device_sn,i.type) d "+
                "WHERE s.patient = d.`user` AND s.hospital='"+hospital+"' AND s.`status`> 0 AND s.patient=p.code AND d.`type` in (1,2) ORDER BY d.record_date desc ";
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(DeviceHealthIndexExportVO.class));
        return list ;
	}
    public JSONObject gethealthStandard(Integer type, String patientCode) {

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/WlyyDeviceService.java

@@ -1,22 +1,21 @@
package com.yihu.wlyy.service.manager.device;
        import com.yihu.wlyy.device.entity.WlyyDevice;
        import com.yihu.wlyy.device.repository.WlyyDeviceDao;
        import org.apache.commons.lang3.StringUtils;
        import org.springframework.beans.factory.annotation.Autowired;
        import org.springframework.data.domain.Page;
        import org.springframework.data.domain.PageRequest;
        import org.springframework.data.jpa.domain.Specification;
        import org.springframework.stereotype.Service;
        import org.springframework.transaction.annotation.Transactional;
        import org.springside.modules.persistence.DynamicSpecifications;
        import org.springside.modules.persistence.SearchFilter;
import com.yihu.wlyy.device.repository.WlyyDeviceDao;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springside.modules.persistence.DynamicSpecifications;
import org.springside.modules.persistence.SearchFilter;
        import javax.persistence.EntityManager;
        import java.util.Date;
        import java.util.HashMap;
        import java.util.List;
        import java.util.Map;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by yww on 2016/12/1.
@@ -86,6 +85,7 @@ public class WlyyDeviceService {
        deviceNew.setApplicantIdentity(device.getApplicantIdentity());
        deviceNew.setApplicantTel(device.getApplicantTel());
        deviceNew.setApplicantMail(device.getApplicantMail());
        deviceNew.setSim(device.getSim());
        return deviceDao.save(deviceNew);
    }

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_list_js.jsp

@@ -165,7 +165,7 @@
					var self = this;
					//状态修改
					$.subscribe('device:info:view', function (event, id) {
						var title = '查看查看信息';
						var title = '查看信息';
						self.deviceInfoDialog = $.ligerDialog.open({
							height: 770,
							width: 560,
@@ -175,7 +175,7 @@
						})
					});
					$.subscribe('device:info:edit', function (event, id) {
						var title = '编辑编辑信息';
						var title = '编辑信息';
						self.deviceInfoDialog = $.ligerDialog.open({
							height: 770,
							width: 560,

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_family_list_js.jsp

@@ -152,6 +152,7 @@
								render: function (row) {
									var html = '';
									html += '<a  href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "sign:info:view", row.id) + '">明细</a>';
									html += '<a style="margin-left:10px;" href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "sign:info:reservation", row.patient) + '">预约记录</a>';
									//html += '<a  style="margin-left:10px;"href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "patient:info:edit", row.id) + '">编辑</a>';
									//html += '<a  style="margin-left:10px;" title="删除" href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}','{2}'])", "patient:info:del", row.id,row.code) + '">删除</a>';
									if (row.adminTeamId) {
@@ -193,6 +194,17 @@
							url: ctx + '/admin/sign/infoInit/' + id
						})
					});
					//查看预约记录
                    $.subscribe('sign:info:reservation', function (event, patient) {
                        var title = '查看预约记录';
                        self.signInfoDialog = $.ligerDialog.open({
                            height: 550,
                            width: 550,
                            // urlParms: {"id": id, "type": "view"},
                            title: title,
                            url: ctx + '/admin/sign/reservation/' + patient
                        })
                    });
				}
			};

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_reservation_modify.jsp

@@ -0,0 +1,80 @@
<%--
  Created by IntelliJ IDEA.
  User: Administrator
  Date: 2018/5/29 0029
  Time: 下午 2:01
  To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html; charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
    <%@ include file="../head/page_head.jsp"%>
    <title>预约记录</title>
    <style type="text/css">
        .m-form-group label.label_title{width: 100px}
        ul#nav{ width:100%; height:30px; background:#00A2CA;margin:0 auto}
        ul#nav li{display:inline; height:30px}
        ul#nav li a{display:inline-block; padding:5px 10px; height:30px;
            color:#FFF; font-family:"\5FAE\8F6F\96C5\9ED1"; font-size:16px}
        ul#nav li a:hover{background:#0095BB;}/*设置鼠标滑过或悬停时变化的背景颜色*/
    </style>
</head>
<body>
<ul id="nav">
    <li><a href="#" onclick="opens(1)">基本信息</a></li>
    <li><a href="#" onclick="opens(2)">预约记录</a></li>
</ul>
<div id="div_reservation_info_form" data-role-form class="m-form-inline f-mt20 f-ml30" data-role-form style="overflow-y: scroll;height: 450px">
    <input type="hidden" id="patient" value='${patient}' data-attr-scan="id"/>
    <%-- ##################################基本信息div 开始###############################--%>
    <div id="div_base_info">
        <div class="m-form-group" style="">
            <label class="label_title" style="width:120px">居民标识符</label>
            <div class="l-text-wrapper m-form-control">
                <input type="text"  id="inp_patient" class="f-w240" data-attr-scan="patient"/>
            </div>
        </div>
        <div class="m-form-group" style="">
            <label class="label_title" style="width:120px">居民姓名</label>
            <div class="l-text-wrapper m-form-control">
                <input type="text"  id="inp_name" class="f-w240" data-attr-scan="name"/>
            </div>
        </div>
        <div class="m-form-group" style="">
            <label class="label_title" style="width:120px">身份证号</label>
            <div class="l-text-wrapper m-form-control">
                <input type="text"  id="inp_idcard" class="f-w240" data-attr-scan="idcard"/>
            </div>
        </div>
        <div class="m-form-group" style="">
            <label class="label_title" style="width:120px">社保卡号</label>
            <div class="l-text-wrapper m-form-control">
                <input type="text"  id="inp_ssc" class="f-w240" data-attr-scan="ssc"/>
            </div>
        </div>
        <div class="m-form-group" style="">
            <label class="label_title" style="width:120px">手机号</label>
            <div class="l-text-wrapper m-form-control">
                <input type="text"  id="inp_mobile" class="f-w240" data-attr-scan="mobile"/>
            </div>
        </div>
    </div>
    <%-- ##################################基本信息div 结束###############################--%>
</div>
</body>
<script>
    function opens(obj){
        if(obj == 1){
            document.getElementById("div_base_info").style.display="block";
            document.getElementById("div_reservation_info").style.display="none";
        }
        if(obj == 2){
            document.getElementById("div_base_info").style.display="none";
            document.getElementById("div_reservation_info").style.display="block";
        }
    }
</script>
<%@ include file="../head/page_foot.jsp"%>
<%@ include file="sign_reservation_modify_js.jsp" %>
</html>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_reservation_modify_js.jsp

@@ -0,0 +1,71 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<script>
    (function ($, win) {
        $(function () {
            var Util = $.Util;
            var patient = $('#patient').val();
            var reservationInfo = "";
            function pageInit() {
                reservationInfo.init();
                reservationInfo.initForm();
            }
            reservationInfo = {
                //变量
                $form: $("#div_reservation_info_form"),
                //费用信息
                init: function () {
                    this.$form.attrScan();
                    //基本信息
                    $('#inp_patient').ligerTextBox({width: 240});
                    $('#inp_name').ligerTextBox({width: 240});
                    $('#inp_idcard').ligerTextBox({width: 240});
                    $('#inp_mobile').ligerTextBox({width: 240});
                    $('#inp_ssc').ligerTextBox({width: 240});
                },
                initForm: function () {
                    if (isNoEmpty(patient) && patient != 0) {
                        $.ajax({
                            url: ctx + "/admin/sign/reservationInfo/" + patient,
                            data: {"patient" : patient},
                            method: "post",
                            dataType: "json",
                            async: false,
                            success: function (result) {
                                if (result.status == '200') {
                                    //通过patient查信息
                                    var data = result.data;
                                    var status = data.status;
                                    reservationInfo.$form.Fields.fillValues({
                                        //基本信息填值
                                        patient: data.patient,
                                        name: data.name,
                                        idcard: data.idcard,
                                        mobile: data.mobile,
                                        ssc: data.ssc,
                                    });
                                } else {
                                    $.Notice.error(result.msg);
                                }
                            },
                            error: function (data) {
                                $.Notice.error("系统异常,请联系管理员！");
                            }
                        });
                    }
                    this.$form.addClass("m-form-readonly"); //表单只读
                    this.bindEvents();
                },
                //绑定事件
                bindEvents: function () {
                    $("#btn_cancel").click(function () {
                        parent.window.closePatientInfoDialog();
                    });
                }
            }
            pageInit();
        });
    })(jQuery, window)
</script>

patient-co-service/wlyy_service/src/main/resources/application.yml

@@ -165,4 +165,8 @@ zyapi:
  openCrypto: true
#    i健康项目地址
wlyy:
  api: http://www.xmtyw.cn/wlyy
  api: http://www.xmtyw.cn/wlyy
#智业预约记录接口
reservation:
  zyurl: http://59.61.92.90:8072/wlyy_service

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -1138,32 +1138,4 @@ public class PatientService extends TokenService {
        }
        return "1";
    }
    /**
     * 根据患者身份证号更新患者医疗保险号情况
     * @param idcard_medicare_number_map
     */
    @Transactional
    public void updatePatientMedicareNumberByIdcard(HashMap<String, String> idcard_medicare_number_map){
        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); // 事物隔离级别，开启新事务
        TransactionStatus status = transactionManager.getTransaction(def); // 获得事务状态
        try {
            for (String idcard : idcard_medicare_number_map.keySet()) {
                patientDao.updatePatientMedicareNumberByIdcard(idcard,idcard_medicare_number_map.get(idcard));
            }
            //事务提交
            transactionManager.commit(status);
        } catch (Exception ex) {
            logger.info("更新患者医疗保险号出错，从基卫获取的患者数据为：START");
            for (String idcard : idcard_medicare_number_map.keySet()) {
                logger.info("idcard:" + idcard);
                logger.info("idcard:" + idcard_medicare_number_map.get(idcard));
            }
            logger.info("更新患者医疗保险号出错，从基卫获取的患者数据为：END");
            //报错事务回滚
            transactionManager.rollback(status);
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/third/jw/JwPatientMedicareNumberService.java

@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
@@ -40,8 +39,6 @@ public class JwPatientMedicareNumberService {
        for(String hospital : hospitals) {
            List<String> idcards = signFamilyDao.findIdcardByStatus(hospital);
            String url = jwUrl + "/third/zysoftservice/getSickCurrnetFamilySignInfo";
            //医疗保险号的居民集合
            HashMap<String, String> idcard_medicare_number_map = new HashMap<>();
            for (String idcard : idcards) {
                List<NameValuePair> params = new ArrayList<>();
                params.add(new BasicNameValuePair("idcard", idcard));