随访相关代码提交

common/common-entity/src/main/java/com/yihu/wlyy/entity/organization/HospitalMapping.java

@@ -29,6 +29,8 @@ public class HospitalMapping extends IdEntity {
    private String appSecret;
    //机构编码号（来自基卫）
    private String sbCode;
    // 基卫授权码
    private String licence;
    public String getSbCode() {
        return sbCode;
@@ -85,4 +87,12 @@ public class HospitalMapping extends IdEntity {
    public void setAppSecret(String appSecret) {
        this.appSecret = appSecret;
    }
    
    public String getLicence() {
        return licence;
    }
    
    public void setLicence(String licence) {
        this.licence = licence;
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/event/ApplicationEvent.java

@@ -170,7 +170,7 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("old_people_tijian_syb_job  job exist");
            }
    
            //居民随访信息同步，每天陵城3点执行一次
            //居民随访信息同步，每天凌晨3点执行一次
            if (!quartzHelper.isExistJob("patient_followup_syb_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("patient_followup_syb_job");
                quartzHelper.addJob(FollowUpSynJob.class, trigger, "patient_followup_syb_job", new HashMap<String, Object>());

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/organization/HospitalMappingDao.java

@@ -32,5 +32,5 @@ public interface HospitalMappingDao extends PagingAndSortingRepository<HospitalM
	HospitalMapping findByCode(String code);
	
	@Query("select a from HospitalMapping a where a.licence is not null and a.licence<>'' and a.type='1'")
	List<HospitalMapping> findJwOrg() throws Exception;
	List<HospitalMapping> findJwOrg();
}

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

@@ -435,6 +435,7 @@ public class JwPrescriptionService {
            params.add(new BasicNameValuePair("TIME_START", startdate));//开始时间
            params.add(new BasicNameValuePair("TIME_END", enddate));//结束时间
            params.add(new BasicNameValuePair("ORG_CODE", hospitalMapping.getCode()));//机构编码
//            params.add(new BasicNameValuePair("IDENTITY_CARD_NO", "350221197506113526"));//身份证
            String response = httpClientUtil.post(url, params, "UTF-8");
    
            //居民随访记录
@@ -461,12 +462,19 @@ public class JwPrescriptionService {
                            String followupNo = json.getString("FOLLOWUP_NO");//随访编号【基卫】:家庭医生服务随访主表ID
                            String dataFrom = json.getString("FOLLOWUP_SOURCE");//随访来源 1.平台端 2.移动端 3.第三方健康之路(移动端)"
                    
                            if ("0".equals(isNewCreate) || "3".equals(dataFrom)) {//修改
                                followup = followUpDao.findByFollowupNo(followupNo);
                                if (followup == null) {
                                    followup.setFollowupNo(followupNo);
                                }
//                            if ("0".equals(isNewCreate) || "3".equals(dataFrom)) {//修改
//                                followup = followUpDao.findByFollowupNo(followupNo);
//                                if(followup == null){
//                                    followup = new Followup();
//                                }
//                            }
    
                            followup = followUpDao.findByFollowupNo(followupNo);
                            if(followup == null){
                                followup = new Followup();
                            }
    
                            followup.setFollowupNo(followupNo);
                    
                            if ("1".equals(dataFrom) || "2".equals(dataFrom)) {
                                followup.setDataFrom("1");
@@ -786,7 +794,10 @@ public class JwPrescriptionService {
                                        drug.setDrugsGroup("normal");
                                        drug.setDrugsCode("");
                                        drug.setDrugsName(json.getString("PHYSIC_NAME" + j));//药物名称
                                        drug.setDose(Double.valueOf(json.getString("PHYSIC_DOSE" + j)));//剂量
                                        if(StringUtils.isNoneBlank(json.getString("PHYSIC_DOSE" + j))){
                                            drug.setDose(Double.valueOf(json.getString("PHYSIC_DOSE" + j)));//剂量
                                        }
                                        
                                        drug.setUnit(json.getString("PHYSIC_UNIT" + j));//单位【MEASURE_UNIT_DICT】
                                        drug.setFrequency(json.getString("FREQUENCY" + j));//频次【RECIPE_FREQUENCY_DICT】
                                        drug.setCreateTime(new Date());
@@ -801,7 +812,9 @@ public class JwPrescriptionService {
                                        drug.setDrugsGroup("insulin");
                                        drug.setDrugsCode("");
                                        drug.setDrugsName(json.getString("INSULIN_NAME" + k));//胰岛素药物名称
                                        drug.setDose(Double.valueOf(json.getString("INSULIN_DOSE" + k)));//胰岛素剂量
                                        if(StringUtils.isNoneBlank(json.getString("INSULIN_DOSE" + k))){
                                            drug.setDose(Double.valueOf(json.getString("INSULIN_DOSE" + k)));//胰岛素剂量
                                        }
                                        drug.setUnit(json.getString("INSULIN_UNIT" + k));//v单位【MEASURE_UNIT_DICT】
                                        drug.setFrequency(json.getString("INSULIN_FREQUENCY" + k));//胰岛素频次【RECIPE_FREQUENCY_DICT】
                                        drug.setCreateTime(new Date());