代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationPatientInfoDO.java

@@ -24,7 +24,7 @@ public class RehabilitationPatientInfoDO extends IdEntity {
    private String mobile;//电话
    private String address;//住址
    private Integer kid;//是否儿科：1是 0否，4岁以下儿童
    private String kidParents;//患者家属
    private String kidParents;//患者家属,上次下转时间
    private String diagnosis;//出院诊断code
    private String diagnosisName;//出院诊断
    private String treatment;//主要病情摘要及诊疗经过

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/controller/DoctorFollowUpController.java

@@ -123,7 +123,7 @@ public class DoctorFollowUpController extends BaseController {
    @GetMapping(value = "queryFollowupFormDetail")
    @ApiOperation(value = "随访记录查询(按随访表单类型)")
    public Envelop queryFollowupFormDetail(
            @ApiParam(value = "随访记录Id") @RequestParam(value = "followupId") Integer followupId,
            @ApiParam(value = "随访记录Id") @RequestParam(value = "followupId") Long followupId,
            @ApiParam(value = "随访表单类型") @RequestParam(value = "followupFormType") String followupFormType) {
        try {
            return ObjEnvelop.getSuccess("查询成功",followUpService.queryFollowupFormDetail(followupId ,followupFormType));

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@@ -14,6 +14,7 @@ import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationPatientInfoDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.dict.service.WlyyHospitalSysDictService;
import com.yihu.jw.hospital.family.dao.WlyyPatientFamilyMemberDao;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.module.followup.dao.*;
@@ -89,6 +90,8 @@ public class FollowUpService {
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    @Autowired
    private WlyyHospitalSysDictService sysDictService;
    @Autowired
    private SystemMessageDao messageDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
@@ -107,7 +110,7 @@ public class FollowUpService {
    @Autowired
    private ExportUtl exportUtl;
    public Map<String,Object> queryFollowupFormDetail(Integer followupId,String followupFormType) {
    public Map<String,Object> queryFollowupFormDetail(Long followupId,String followupFormType) {
        String sql = "";
        if("1".equals(followupFormType)) { // 全院通用
            sql = "select distinct " +
@@ -128,7 +131,16 @@ public class FollowUpService {
            sql = baseFollowupHandFootSql + " where f.followup_id ="+followupId + " limit 1";
        }
        if(StringUtils.isNotBlank(sql)) {
            return jdbcTemplate.queryForMap(sql);
            Map<String,Object> map = jdbcTemplate.queryForMap(sql);
            if("1".equals(followupFormType)) { // 全院通用
                Followup followup = followupDao.findById(followupId).orElse(null);
                if(followup!=null){
                    map.put("doctorName",followup.getDoctorName());
                    map.put("name",followup.getPatientName());
                    map.put("followupManagerStatusValue",sysDictService.getDictValue("FOLLOWUP_MANAGER_STATUS",followup.getFollowupManagerStatus()));
                }
            }
            return map;
        }
        return null;
    }
@@ -1629,8 +1641,10 @@ public class FollowUpService {
            followupProject = "1";
            //通用
            List<FollowupContent> dataList = followupContentDao.findByFollowupIdAndFollowupProject(followupId, followupProject);
            //删除原有记录
            followupContentDao.deleteAll(dataList);
            if(dataList.size()>0){
                //删除原有记录
                followupContentDao.deleteAll(dataList);
            }
            Map<String, String> data = objectMapper.readValue(followupProjectData, Map.class);
            if (data != null && data.keySet().size() > 0) {
                List<FollowupContent> newList = new ArrayList<>();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/SynchronizePatientService.java

@@ -95,7 +95,7 @@ public class SynchronizePatientService  {
        String conNo = infoDO.getConNo();//就诊次数
        String visitNo = infoDO.getVisitNo();//就诊号
        String hisPid = infoDO.getHisPid();//his居民id
        infoDO.setKidParents(DateUtil.getStringDate());
        JSONArray cardList = null;
        if(StringUtils.isBlank(hisPid)){
            cardList = dsyyPrescriptionService.findCardNo(idcard);
@@ -451,8 +451,11 @@ public class SynchronizePatientService  {
            preDays = "7";
        }
        Date preTime = DateUtil.getPreDays(nowDate, -Integer.parseInt(preDays));
        String hourBefore = DateUtil.dateToStrLong(DateUtil.getPreHours(new Date(),-3));//新增3小时不重复下转处理
        String preTimeStr = DateUtil.dateToStrShort(preTime);
        String sql = " select id from wlyy_rehabilitation_patient_info where status='"+status+"' and create_time>'"+preTimeStr+"' ";
        String sql = " select id from wlyy_rehabilitation_patient_info where status='"+status+"' and create_time>'"+preTimeStr+"' " +
                " and (kid_parents is null or kid_parents<='"+hourBefore+"') ";
        if(StringUtils.isNotBlank(eventType)){
            sql += " and event_type='"+eventType+"' ";
        }