随访记录BUG修改

common/common-entity/src/main/java/com/yihu/wlyy/entity/followup/Followup.java

@@ -41,6 +41,8 @@ public class Followup extends IdEntity {
	private String orgCode;
	//社区名称
	private String orgName;
	//基卫机构编码
	private String jworgCode;
	//患者代码
	private String patientCode;
	//患者姓名
@@ -262,4 +264,12 @@ public class Followup extends IdEntity {
	public void setJwdoctorCode(String jwdoctorCode) {
		this.jwdoctorCode = jwdoctorCode;
	}
	
	public String getJworgCode() {
		return jworgCode;
	}
	
	public void setJworgCode(String jworgCode) {
		this.jworgCode = jworgCode;
	}
}

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

@@ -133,11 +133,13 @@ public class SignController {
            @ApiParam(name="TIME_END",value="修改的开始时间",defaultValue = "2017-06-7 23:59:59")
            @RequestParam(value="TIME_END",required = false) String TIME_END,
            @ApiParam(name="IDENTITY_CARD_NO",value="身份证号",defaultValue = "350221197506113526")
            @RequestParam(value="IDENTITY_CARD_NO",required = false) String IDENTITY_CARD_NO){
            @RequestParam(value="IDENTITY_CARD_NO",required = false) String IDENTITY_CARD_NO,
            @ApiParam(name="ORG_CODE",value="机构代码",defaultValue = "3502030500")
            @RequestParam(value="ORG_CODE",required = false) String ORG_CODE){
        try {
            String response = "";
            if(StringUtils.isBlank(IDENTITY_CARD_NO)){
                response = signZYService.getEhrChroDaysFollowUpInfoRecord(TIME_START,TIME_END);
                response = signZYService.getEhrChroDaysFollowUpInfoRecord(TIME_START,TIME_END,ORG_CODE);
            }else{
                response = signZYService.getEhrChroDaysFollowUpInfoRecordByIdcard(IDENTITY_CARD_NO);
            }
@@ -156,14 +158,16 @@ public class SignController {
    }
    
    @RequestMapping(value = "uploadEhrSickChroDaysFollowUpRecord",method = RequestMethod.POST)
    @ApiOperation("查询家庭医生服务日常随访信息接口")
    @ApiOperation("上传家庭医生服务日常随访信息")
    public Result uploadEhrSickChroDaysFollowUpRecord(
            @ApiParam(name="OPERATOR",value="操作员代码",defaultValue = "")
            @RequestParam(value="OPERATOR",required = true) String OPERATOR,
            @ApiParam(name="data",value="Json格式字符串",defaultValue = "")
            @RequestParam(value="data",required = true) String data){
            @RequestParam(value="data",required = true) String data,
            @ApiParam(name="ORG_CODE",value="机构代码",defaultValue = "3502030500")
            @RequestParam(value="ORG_CODE",required = false) String ORG_CODE){
        try {
            String response = signZYService.uploadEhrSickChroDaysFollowUpRecord(OPERATOR,data);
            String response = signZYService.uploadEhrSickChroDaysFollowUpRecord(OPERATOR,data,ORG_CODE);
            return Result.success("上传成功！",response);
        } catch (Exception ex) {
            ex.printStackTrace();

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

@@ -145,8 +145,8 @@ public class SignZYService {
     * @param time_end
     * @return
     */
	public String getEhrChroDaysFollowUpInfoRecord(String time_start, String time_end)  throws Exception{
        String[] hospitalMapping = getHospitalMapping(null); //获取机构映射
	public String getEhrChroDaysFollowUpInfoRecord(String time_start, String time_end,String ORG_CODE)  throws Exception{
        String[] hospitalMapping = getHospitalMapping(ORG_CODE); //获取机构映射
        String response = zysoftService.getEhrChroDaysFollowUpInfoRecord(time_start,time_end,hospitalMapping[0],hospitalMapping[1]);
        return response;
	}
@@ -168,8 +168,8 @@ public class SignZYService {
     * @param data
     * @return
     */
	public String uploadEhrSickChroDaysFollowUpRecord(String operator, String data) throws Exception{
        String[] hospitalMapping = getHospitalMapping(null); //获取机构映射
	public String uploadEhrSickChroDaysFollowUpRecord(String operator, String data,String ORG_CODE) throws Exception{
        String[] hospitalMapping = getHospitalMapping(ORG_CODE); //获取机构映射
        String response = zysoftService.uploadEhrSickChroDaysFollowUpRecord(operator,data,hospitalMapping[0],hospitalMapping[1]);
        return response;
	}

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

@@ -828,6 +828,7 @@ public class ZysoftService {
        header.put("LICENCE",licence);
        
        Map<String,String> params = new HashMap<>();
        params.put("ORG_CODE",hospital);
        params.put("TIME_START",time_start);
        params.put("TIME_END",time_end);
        
@@ -868,7 +869,7 @@ public class ZysoftService {
        
        com.alibaba.fastjson.JSONObject json = JSON.parseObject(data);
        
        String response = postSecond("getEhrChroDaysFollowUpInfoRecord","查询家庭医生服务日常随访信息接口",json,header);
        String response = postSecond("getEhrChroDaysFollowUpInfoRecord","上传家庭医生服务日常随访信息",json,header);
        
        return response;
	}

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

@@ -480,23 +480,23 @@ public class JwPrescriptionService {
    
                        /******************* 医生机构映射 ****************/
    
                        String orgCode = json.getString("ORG_CODE");//机构编码
                        followup.setOrgCode(orgCode);
                        String jworgCode = json.getString("ORG_CODE");//基卫机构编码
                        followup.setJworgCode(jworgCode);//基卫机构编码
                        String jwdoctorCode = json.getString("FOLLOWUP_VISIT_DOCTOR_NAME");//基卫医生CODE：随访医生 基卫系统的随访医生ID
                        followup.setJwdoctorCode(jwdoctorCode);
                        //医院映射
                        HospitalMapping hm = hospitalMappingDao.getCodeByMapping(orgCode, "1");
                        HospitalMapping hm = hospitalMappingDao.getCodeByMapping(jworgCode, "1");
                        if (hm == null) {
                            logger.info("no mapping hospital:" + orgCode);
                            logger.info("no mapping hospital:" + jworgCode);
                            continue;
                        }
                        //医生映射
                        Doctor doctor = doctorDao.findMappingDoctor(jwdoctorCode, orgCode);
                        Doctor doctor = doctorDao.findMappingDoctor(jwdoctorCode, jworgCode);
                        if (doctor == null) {
                            logger.info("no mapping hospital:" + orgCode + ",familyDoctor:" + jwdoctorCode);
                            logger.info("no mapping hospital:" + jworgCode + ",familyDoctor:" + jwdoctorCode);
                            continue;
                        }
                        
                        followup.setOrgCode(hm.getCode());//i健康机构编码
                        String doctorCode = doctor.getCode();//医生CODE
                        String doctorName = doctor.getName();//医生姓名 "FOLLOWUP_VISIT_DOCTOR_NAME_N":"随访医生 基卫系统的随访医生中文名"
                        String orgName = hm.getName();//机构名称