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

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

@@ -2,8 +2,7 @@ package com.yihu.wlyy.controller.manager.device;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.device.entity.DeviceHealthIndex;
import com.yihu.wlyy.device.entity.DeviceHealthIndexVO;
import com.yihu.wlyy.device.entity.PatientDeviceVO;
import com.yihu.wlyy.device.entity.DeviceHealthIndexExportVO;
import com.yihu.wlyy.service.manager.device.DeviceHealthIndexService;
import jxl.Workbook;
import jxl.write.*;
@@ -57,7 +56,7 @@ public class DeviceHealthIndexController extends BaseController{
            @RequestParam(value = "hospital",required = false)String hospital,
            HttpServletResponse response){
        try {
            List<DeviceHealthIndexVO> wlyyDevices = healthIndexService.exportDeviceHealthIndexList(town,hospital);
            List<DeviceHealthIndexExportVO> wlyyDevices = healthIndexService.exportDeviceHealthIndexList(town,hospital);
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename="+ new String( "deviceHealthIndexDataList.xls"));
            OutputStream os = response.getOutputStream();
@@ -84,7 +83,7 @@ public class DeviceHealthIndexController extends BaseController{
            ws = wwb.createSheet("sheet",1);
            addHeader(ws);
            int i = 1;
            for (DeviceHealthIndexVO m : (List<DeviceHealthIndexVO>) ls) {
            for (DeviceHealthIndexExportVO m : (List<DeviceHealthIndexExportVO>) ls) {
                addCell(ws, i, 0, m.getName(),"");
                addCell(ws, i, 1, m.getMobile(),"");
                addCell(ws, i, 2, m.getIdcard(),"");

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

@@ -1,8 +1,11 @@
package com.yihu.wlyy.controller.manager.device;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.device.entity.PatientDeviceVO;
import com.yihu.wlyy.device.entity.PatientDeviceExportVO;
import com.yihu.wlyy.device.entity.WlyyPatientDeviceVO;
import com.yihu.wlyy.entity.Doctor;
import com.yihu.wlyy.entity.WlyyPatientDevice;
import com.yihu.wlyy.service.doctor.DoctorService;
import com.yihu.wlyy.service.manager.device.WlyyPatientDeviceService;
import jxl.Workbook;
import jxl.write.*;
@@ -27,9 +30,24 @@ import java.util.List;
public class WlyyPatientDeviceController extends BaseController {
    @Autowired
    private WlyyPatientDeviceService patientDeviceService;
    @Autowired
    private DoctorService doctorService;
    @RequestMapping(value = "initial", method = RequestMethod.GET)
    public String listPageInit(){
    
        String currentid = getUID();
    
        Doctor doctor = doctorService.findDoctorByCode(currentid);
    
        String hospitalCode = "";
        
        if(doctor != null){
            hospitalCode = doctor.getHospital();
        }
        
        request.setAttribute("hospitalCode",hospitalCode);
        
        return "device/patientDevice_list";
    }
@@ -40,6 +58,34 @@ public class WlyyPatientDeviceController extends BaseController {
            @RequestParam(value = "categoryCode",required = false) String categoryCode,
            @RequestParam(value = "deviceSn",required = false) String deviceSn,
            @RequestParam(value = "userName",required = false) String userName,
            @RequestParam(value = "doctorName",required = false) String doctorName,
            @RequestParam(value = "hospitalCode",required = false) String hospitalCode,
            @RequestParam(value = "hospitalName",required = false) String hospitalName,
            @RequestParam(value = "page") Integer page,
            @RequestParam(value = "rows") Integer pageSize){
        try {
            
            
            
            List<WlyyPatientDeviceVO> patientDevices = patientDeviceService.searchListNew(deviceName,categoryCode, deviceSn, userName, doctorName,hospitalName,hospitalCode,page, pageSize);
            Long totalcount = patientDeviceService.getCountSearchListNew(deviceName,categoryCode, deviceSn, userName, doctorName,hospitalName,hospitalCode);
            return write(200,"操作成功",page,pageSize,totalcount,patientDevices);
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败！");
        }
    }
    
    @RequestMapping(value = "listbak",method = RequestMethod.POST)
    @ResponseBody
    public String searchListbak(
            @RequestParam(value = "deviceName",required = false) String deviceName,
            @RequestParam(value = "categoryCode",required = false) String categoryCode,
            @RequestParam(value = "deviceSn",required = false) String deviceSn,
            @RequestParam(value = "userName",required = false) String userName,
            @RequestParam(value = "doctorName",required = false) String doctorName,
            @RequestParam(value = "hospital",required = false) String hospital,
            @RequestParam(value = "page") Integer page,
            @RequestParam(value = "rows") Integer pageSize){
        try {
@@ -49,7 +95,7 @@ public class WlyyPatientDeviceController extends BaseController {
            error(ex);
            return error(-1,"操作失败！");
        }
        
    }
    //设备解绑（记录删除）
@@ -76,7 +122,7 @@ public class WlyyPatientDeviceController extends BaseController {
            @RequestParam(value = "hospital",required = false)String hospital,
            HttpServletResponse response){
        try {
            List<PatientDeviceVO> wlyyDevices = patientDeviceService.exportPatientDeviceList(town,hospital);
            List<PatientDeviceExportVO> wlyyDevices = patientDeviceService.exportPatientDeviceList(town,hospital);
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename="+ new String( "patientDeviceDataList.xls"));
            OutputStream os = response.getOutputStream();
@@ -103,7 +149,7 @@ public class WlyyPatientDeviceController extends BaseController {
            ws = wwb.createSheet("sheet",1);
            addHeader(ws);
            int i = 1;
            for (PatientDeviceVO m : (List<PatientDeviceVO>) ls) {
            for (PatientDeviceExportVO m : (List<PatientDeviceExportVO>) ls) {
                addCell(ws, i, 0, m.getName(),"");
                addCell(ws, i, 1, m.getMobile(),"");
                addCell(ws, i, 2, m.getIdcard(),"");

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

@@ -4,7 +4,7 @@ package com.yihu.wlyy.device.entity;
 * @author huangwenjie
 * @date 2017/12/12 10:10
 */
public class DeviceHealthIndexVO {
public class DeviceHealthIndexExportVO {
	private String patient;
	private String name;
	private String mobile;

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

@@ -4,7 +4,7 @@ package com.yihu.wlyy.device.entity;
 * @author huangwenjie
 * @date 2017/12/12 09:47
 */
public class PatientDeviceVO {
public class PatientDeviceExportVO {
	private String patient;
	private String name;
	private String mobile;

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

@@ -0,0 +1,146 @@
package com.yihu.wlyy.device.entity;
import java.util.Date;
/**
 * 居民体征设备
 * @author huangwenjie
 * @date 2018/1/24 09:17
 */
public class WlyyPatientDeviceVO {
	private Integer id;
	private Integer deviceId;
	private String user;
	private String userName;
	private String categoryCode;
	private String deviceName;
	private String deviceSn;
	private String sim;
	private String userType;
	private String userIdcard;
	private Date czrq;
	private String doctor;
	private String doctorName;
	private String hospital;
	private String hospitalName;
	
	public Integer getId() {
		return id;
	}
	
	public void setId(Integer id) {
		this.id = id;
	}
	
	public Integer getDeviceId() {
		return deviceId;
	}
	
	public void setDeviceId(Integer deviceId) {
		this.deviceId = deviceId;
	}
	
	public String getUser() {
		return user;
	}
	
	public void setUser(String user) {
		this.user = user;
	}
	
	public String getUserName() {
		return userName;
	}
	
	public void setUserName(String userName) {
		this.userName = userName;
	}
	
	public String getCategoryCode() {
		return categoryCode;
	}
	
	public void setCategoryCode(String categoryCode) {
		this.categoryCode = categoryCode;
	}
	
	public String getDeviceName() {
		return deviceName;
	}
	
	public void setDeviceName(String deviceName) {
		this.deviceName = deviceName;
	}
	
	public String getDeviceSn() {
		return deviceSn;
	}
	
	public void setDeviceSn(String deviceSn) {
		this.deviceSn = deviceSn;
	}
	
	public String getSim() {
		return sim;
	}
	
	public void setSim(String sim) {
		this.sim = sim;
	}
	
	public String getUserType() {
		return userType;
	}
	
	public void setUserType(String userType) {
		this.userType = userType;
	}
	
	public String getUserIdcard() {
		return userIdcard;
	}
	
	public void setUserIdcard(String userIdcard) {
		this.userIdcard = userIdcard;
	}
	
	public Date getCzrq() {
		return czrq;
	}
	
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	
	public String getDoctor() {
		return doctor;
	}
	
	public void setDoctor(String doctor) {
		this.doctor = doctor;
	}
	
	public String getDoctorName() {
		return doctorName;
	}
	
	public void setDoctorName(String doctorName) {
		this.doctorName = doctorName;
	}
	
	public String getHospital() {
		return hospital;
	}
	
	public void setHospital(String hospital) {
		this.hospital = hospital;
	}
	
	public String getHospitalName() {
		return hospitalName;
	}
	
	public void setHospitalName(String hospitalName) {
		this.hospitalName = hospitalName;
	}
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/doctor/DoctorService.java

@@ -0,0 +1,21 @@
package com.yihu.wlyy.service.doctor;
import com.yihu.wlyy.entity.Doctor;
import com.yihu.wlyy.repository.DoctorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author huangwenjie
 * @date 2018/1/24 16:20
 */
@Service
public class DoctorService {
	
	@Autowired
	private DoctorDao doctorDao;
	
	public Doctor findDoctorByCode(String code) {
		return doctorDao.findByCode(code);
	}
}

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

@@ -1,8 +1,7 @@
package com.yihu.wlyy.service.manager.device;
import com.yihu.wlyy.device.entity.DeviceHealthIndex;
import com.yihu.wlyy.device.entity.DeviceHealthIndexVO;
import com.yihu.wlyy.device.entity.PatientDeviceVO;
import com.yihu.wlyy.device.entity.DeviceHealthIndexExportVO;
import com.yihu.wlyy.device.repository.DeviceHealthIndexDao;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.repository.PatientDao;
@@ -94,8 +93,8 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
       return patientDao.findByCode(patientCode);
    }
	
	public List<DeviceHealthIndexVO> exportDeviceHealthIndexList(String town, String hospital) {
        List<DeviceHealthIndexVO> list = new ArrayList<>();
	public List<DeviceHealthIndexExportVO> exportDeviceHealthIndexList(String town, String hospital) {
        List<DeviceHealthIndexExportVO> list = new ArrayList<>();
        String sql  = "SELECT " +
                "s.patient," +
                "s.`name`," +
@@ -107,7 +106,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
                "p.address FROM wlyy_sign_family s,wlyy_patient_device d,wlyy_patient p WHERE s.patient=d.`user` AND s.hospital='"+hospital+"' AND s.`status`> 0 AND s.patient=p.CODE AND s.patient NOT IN (" +
                "SELECT s.patient FROM wlyy_sign_family s,(" +
                "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(DeviceHealthIndexVO.class));
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(DeviceHealthIndexExportVO.class));
        return list ;
	}
}

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

@@ -1,12 +1,11 @@
package com.yihu.wlyy.service.manager.device;
import com.yihu.wlyy.device.entity.PatientDeviceVO;
import com.yihu.wlyy.device.entity.PatientDeviceExportVO;
import com.yihu.wlyy.device.entity.WlyyPatientDeviceVO;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.WlyyPatientDevice;
import com.yihu.wlyy.entity.wechat.WechatTotalVO;
import com.yihu.wlyy.repository.PatientDao;
import com.yihu.wlyy.repository.WlyyPatientDeviceDao;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -89,8 +87,8 @@ public class WlyyPatientDeviceService extends BaseJpaService<WlyyPatientDevice,W
     * @param hospital
     * @return
     */
	public List<PatientDeviceVO> exportPatientDeviceList(String town, String hospital) {
        List<PatientDeviceVO> list = new ArrayList<>();
	public List<PatientDeviceExportVO> exportPatientDeviceList(String town, String hospital) {
        List<PatientDeviceExportVO> list = new ArrayList<>();
        String sql  = "SELECT s.patient," +
                "s.`name`," +
                "s.mobile," +
@@ -103,7 +101,132 @@ public class WlyyPatientDeviceService extends BaseJpaService<WlyyPatientDevice,W
                "CASE WHEN p.openid IS NULL THEN '未绑定' ELSE '已绑定' END isopenid " +
                "FROM wlyy_sign_family s,wlyy_patient_device d,wlyy_patient p " +
                "WHERE s.patient=d.`user` AND s.hospital='"+hospital+"' AND s.`status`> 0 AND s.patient=p.CODE ORDER BY patient";
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(PatientDeviceVO.class));
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(PatientDeviceExportVO.class));
        return list ;
	}
    
    /*=
     * 根据社区或者医生名称查找居民设备绑定详情
     *
     * @param deviceName
     * @param categoryCode
     * @param deviceSn
     * @param userName
     * @param doctorName
     * @param hospital
     * @param page
     * @param pageSize
     * @return
     * @throws Exception
     */
	public List<WlyyPatientDeviceVO> searchListNew(String deviceName,
                                                   String categoryCode,
                                                   String deviceSn,
                                                   String userName,
                                                   String doctorName,
                                                   String hospitalName,
                                                   String hospitalCode,
                                                   Integer page, Integer pageSize) throws Exception{
        
        List<WlyyPatientDeviceVO> list = new ArrayList<>();
        String sql  = "SELECT s.patient," +
                "d.id as id," +
                "d.device_id as deviceId," +
                "d.user as user," +
                "p.name as userName," +
                "d.category_code as categoryCode," +
                "d.device_name as deviceName," +
                "d.device_sn as deviceSn," +
                "d.sim as sim," +
                "d.user_type as userType," +
                "s.mobile," +
                "CONCAT(LEFT (s.idcard,6),'**********',RIGHT (s.idcard,2)) userIdcard," +
                "s.doctor_name as doctorName," +
                "s.doctor as doctor," +
                "d.czrq as czrq," +
                "s.hospital_name as hospitalName," +
                "s.hospital as hospital " +
                "FROM " +
                "wlyy_sign_family s," +
                "wlyy_patient_device d," +
                "wlyy_patient p " +
                "WHERE s.patient=d.`user` ";
        if(StringUtils.isNotBlank(hospitalName)){
            sql = sql + "AND s.hospital_name like '%"+hospitalName+"%' ";
        }
        
        if(StringUtils.isNotBlank(hospitalCode)){
            sql = sql + "AND s.hospital = '"+hospitalCode+"' ";
        }
        
        if(StringUtils.isNotBlank(doctorName)){
            sql = sql + "AND s.doctor_name like '%"+doctorName+"%' ";
        }
        
        if(StringUtils.isNotBlank(userName)){
            sql = sql + "AND p.name like '%"+userName+"%' ";
        }
        
        if(StringUtils.isNotBlank(deviceSn)){
            sql = sql + "AND d.device_sn like '%"+deviceSn+"%' ";
        }
        
        if(StringUtils.isNotBlank(categoryCode)){
            sql = sql + "AND d.category_code like '%"+categoryCode+"%' ";
        }
        
        if(StringUtils.isNotBlank(deviceName)){
            sql = sql + "AND d.device_name like '%"+deviceName+"%' ";
        }
        
        sql = sql +"AND s.`status`> 0 AND s.patient=p.CODE " +
                "ORDER BY czrq DESC ";
        
        sql = sql+" limit " + (page-1)*pageSize+", "+pageSize;
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(WlyyPatientDeviceVO.class));
        return list ;
	}
    
    public Long getCountSearchListNew(String deviceName, String categoryCode, String deviceSn, String userName, String doctorName, String hospitalName,String hospitalCode) {
    
        String sql  = "SELECT count(d.id)" +
                "FROM " +
                "wlyy_sign_family s," +
                "wlyy_patient_device d," +
                "wlyy_patient p " +
                "WHERE s.patient=d.`user` ";
        if(StringUtils.isNotBlank(hospitalName)){
            sql = sql + "AND s.hospital like '%"+hospitalName+"%' ";
        }
    
        if(StringUtils.isNotBlank(hospitalCode)){
            sql = sql + "AND s.hospital = '"+hospitalCode+"' ";
        }
    
        if(StringUtils.isNotBlank(doctorName)){
            sql = sql + "AND s.doctor_name like '%"+userName+"%' ";
        }
    
        if(StringUtils.isNotBlank(userName)){
            sql = sql + "AND p.name like '%"+doctorName+"%' ";
        }
    
        if(StringUtils.isNotBlank(deviceSn)){
            sql = sql + "AND d.device_sn like '%"+deviceSn+"%' ";
        }
    
        if(StringUtils.isNotBlank(categoryCode)){
            sql = sql + "AND d.category_code like '%"+categoryCode+"%' ";
        }
    
        if(StringUtils.isNotBlank(deviceName)){
            sql = sql + "AND d.device_name like '%"+deviceName+"%' ";
        }
    
        sql = sql +"AND s.`status`> 0 AND s.patient=p.CODE ";
    
        Long total = jdbcTemplate.queryForObject(sql, Long.class);
    
        return total ;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/prescription/PrescriptionService.java

@@ -167,7 +167,7 @@ public class PrescriptionService {
		
		if(ispage){
			page = page-1;
			prescriptionsql = prescriptionsql +" limit " + page*pageSize+", "+(page+1)*pageSize;
			prescriptionsql = prescriptionsql +" limit " + page*pageSize+", "+pageSize;
		}
		
		list =  jdbcTemplate.query(prescriptionsql,new BeanPropertyRowMapper(PrescriptionVO.class));

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

@@ -17,6 +17,10 @@
	<!-- 检索条件 -->
	<div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form style='display: block;'>
		<div class="m-form-group f-mt10">
			<div class="m-form-control f-ml15">
				<input type="hidden" id="inp_hospital_code"value='${hospitalCode}' data-attr-scan="hospitalCode">
				<input type="text" id="inp_hospital_name" placeholder="请输入机构名称" class="f-ml10" data-attr-scan="hospitalName"/>
			</div>
			<div class="m-form-control f-ml15">
				<input type="text" id="inp_device_name" placeholder="请输入设备名称" class="f-ml10" data-attr-scan="deviceName"/>
			</div>
@@ -29,10 +33,13 @@
			<div class="m-form-control f-ml15">
				<input type="text" id="inp_user_name" placeholder="请输入居民姓名" class="f-ml10" data-attr-scan="userName"/>
			</div>
			<sec:authorize url="/admin/patientDevice/list">
			<div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
				<span>查询</span>
			<div class="m-form-control f-ml15">
				<input type="text" id="inp_doctor_name" placeholder="请输入医生姓名" class="f-ml10" data-attr-scan="doctorName"/>
			</div>
			<sec:authorize url="/admin/patientDevice/list">
				<div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
					<span>查询</span>
				</div>
			</sec:authorize>
		</div>
	</div>

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

@@ -34,12 +34,18 @@
				$categoryCode: $("#inp_categoryCode"),//设备类型
				$deviceCode: $("#inp_device_code"),
				$userName: $("#inp_user_name"),//人员姓名
                $doctorName: $("#inp_doctor_name"),//医生姓名
                $hosiptalName: $("#inp_hospital_name"),//社区名称
                $hosiptalCode: $("#hospitalCode"),//社区CODE
				init: function () {
					this.$element.show();
					this.$element.attrScan();
					window.form = this.$element;
					this.$deviceName.ligerTextBox({width: 200});
					this.$deviceCode.ligerTextBox({width: 200});
					this.$deviceName.ligerTextBox({width: 150});
					this.$deviceCode.ligerTextBox({width: 150});
					this.$userName.ligerTextBox({width: 150});
					this.$hosiptalName.ligerTextBox({width: 150});
					this.$doctorName.ligerTextBox({width: 150});
					this.typeBox = this.$categoryCode.ligerComboBox({
						width: 150,
						data: [
@@ -74,7 +80,7 @@
							{display: 'ID', name: 'id', hide: true},
							{display: '设备名称', name: 'deviceName', width: '15%', align: "left"},
							{
								display: '设备类型', name: 'categoryCode', width: '10%', align: "left",
								display: '类型', name: 'categoryCode', width: '5%', align: "left",
								render: function (row) {
									if (row.categoryCode == 1) {
										return "血糖仪"
@@ -85,9 +91,11 @@
									return ""
								}
							},
							{display: '设备SN码', name: 'deviceSn', width: '10%', align: "left"},
							{display: '设备sim码', name: 'sim', width: '10%', align: "left"},
							{display: '居民姓名', name: 'userName', width: '10%', align: "center"},
							{display: 'SN码', name: 'deviceSn', width: '10%', align: "left"},
							{display: 'SIM码', name: 'sim', width: '5%', align: "left"},
                            {display: '社区', name: 'hospitalName', width: '10%', align: "left"},
                            {display: '医生', name: 'doctorName', width: '5%', align: "left"},
							{display: '居民姓名', name: 'userName', width: '5%', align: "center"},
							{
								display: '绑定按键', name: 'userType', width: '10%', align: "center",
								render: function (row) {

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/GuahaoController.java

@@ -325,7 +325,7 @@ public class GuahaoController {
	@RequestMapping(value = "/imm/GetOrgScheduleAndNumberList",method = RequestMethod.POST)
	@ResponseBody
	@ApiOperation("计免：获取免疫接种排班信息和号源信息")
	public Result GetOrgScheduleAndNumberList(@ApiParam(name="OrgCode",value="条形编码",defaultValue = "")
	public Result GetOrgScheduleAndNumberList(@ApiParam(name="OrgCode",value="机构编码",defaultValue = "")
	                                          @RequestParam String OrgCode)
	{
		try {

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/guahao/GuahaoService.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.service.service.guahao;
import cn.com.zoe.crypto.jna.CryptoKey;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -85,6 +86,12 @@ public class GuahaoService {
    
    @Value("${zyapi.openCrypto}")
    private Boolean openCrypto;
    
    @Value("${imm.url}")
    private String immUrl;
    
    @Value("${imm.credential}")
    private String immcredential;
    /**
     * 解析挂号后
@@ -1179,10 +1186,11 @@ public class GuahaoService {
        String re = "";
    
        ZysoftApi api = ZysoftApi.getSingleton();
        CryptoKey key = api.buildCryptoKey();
        if(!params.containsKey("Credential")&&!params.containsKey("Key")) {
            //strCredential和strKey设置
            params.put("Credential", api.getCryptoCredential());
            params.put("Key", api.getCryptoKey());
            params.put("Credential", api.encodeParam(key,immcredential));
            params.put("Key", key.getKey());
        }
        
        String msgBody = net.sf.json.JSONObject.fromObject(params).toString();
@@ -1194,14 +1202,15 @@ public class GuahaoService {
        
        int times = 0;
        try {
            re = api.post("imm/"+apistr, params, null,false);
//            re = api.post("jhmy/"+apistr, params, null,false);
            re = api.post(immUrl+"/"+apistr, params, null,false);
    
            //---结果验证，并保存日志 ---START
            if (StringUtils.isEmpty(re)) {
                // 请求失败
                //保存http日志
                logService.saveHttpLog(isSuccess,apistr,content,method,apistr,net.sf.json.JSONObject.fromObject(params).toString(),re,error);
                throw new Exception(error);
                logService.saveHttpLog(isSuccess,apistr,content,method,apistr,net.sf.json.JSONObject.fromObject(params).toString(),re,"接口返回的结果为空");
                throw new Exception("接口返回的结果为空");
            } else if (StringUtils.startsWith(re, "System-Error")) {
                // 调用失败
                //保存http日志
@@ -1308,9 +1317,12 @@ public class GuahaoService {
        String condition = "<root><zone>350203</zone><zone>350206</zone><zone>350205</zone><zone>350211</zone><zone>350212</zone><zone>350213</zone></root>";
        String[] values = SOAPUtil.getCredential(condition, true);
//        System.out.println(condition);
        params.put("Condition", values[0]);
        params.put("Credential", values[1]);
        params.put("Key", values[2]);
    
        ZysoftApi api =  ZysoftApi.getSingleton();
        CryptoKey key = api.buildCryptoKey();
        params.put("Condition", api.encodeParam(key,condition));
        params.put("Credential", api.encodeParam(key,immcredential));
        params.put("Key", key.getKey());
        return immPostSecond("GetOrgImmuneList","计免预约-获取免疫接种机构列表",params);
    }

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

@@ -99,6 +99,10 @@ spring:
im:
  data_base_name: im_new
imm:
  url: imm
  credential: <root><org code="jkzk" /><visitor type="0" code="jkzl" key="jkzl" /></root>
zyapi:
  openCrypto: false
#    i健康项目地址
@@ -122,6 +126,10 @@ spring:
im:
  data_base_name: im_new
imm:
  url: imm
  credential: <root><org code="jkzk" /><visitor type="0" code="jkzl" key="jkzl" /></root>
zyapi:
  openCrypto: false
#    i健康项目地址
@@ -145,6 +153,10 @@ spring:
im:
  data_base_name: im
imm:
    url: jhmy
    credential: <root><org code="jtqy" /><visitor type="0" code="jtqy" key="jtqy" /></root>
zyapi:
  openCrypto: true
#    i健康项目地址