LAPTOP-KB9HII50\70708 2 vuotta sitten
vanhempi
commit
6b16266768

+ 6 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@ -336,6 +336,12 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                patientMappingDO.setCreateTime(new Date());
                patientMappingDao.save(patientMappingDO);
            }
//            if("xm_mlwyy_wx".equals(wxId)&&!"7".equals(dictId)){
//                //家人关系如果没有本人就加上本人
//                List<WlyyPatientFamilyMemberDO> ownlist = wlyyPatientFamilyMemberDao.findByPatientAndFamilyRelation(patientNewId,"7");
//
//            }
            resultMap.put("patientId",patientId);
            resultMap.put("familyMember",patientNewId);
            resultMap.put("idCard",idCard);

+ 13 - 0
business/base-service/src/main/java/com/yihu/jw/processGuidance/service/ProcessGuidanceService.java

@ -65,6 +65,19 @@ public class ProcessGuidanceService {
            BaseProcessGuidanceThirdPushLogDO logDO = logDOList.get(0);
            logDO.setGuidanceId("1");
            thirdPushLogDao.save(logDO);
        }else {
            setp--;
            List<BaseProcessGuidanceThirdPushLogDO> logDOS = thirdPushLogDao.findByIdcard(patient);
            if(logDOS.size()>0){
                for (BaseProcessGuidanceThirdPushLogDO logDO:logDOS){
                    if(!"1".equals(logDO.getNodeCode())){
                        logDO.setGuidanceId("0");
                    }
                }
                thirdPushLogDao.saveAll(logDOS);
                setp = 1;
            }
        }
        return setp;
    }

+ 0 - 1
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ProcessGuidanceEndpoint.java

@ -30,7 +30,6 @@ public class ProcessGuidanceEndpoint extends EnvelopRestEndpoint {
                                           @ApiParam(name = "setp", value = "当前步骤", required = true)
                                           @RequestParam(value = "setp") Integer setp) {
        try {
            return ObjEnvelop.getSuccess("查询成功",processGuidanceService.nextStep(patient,setp));
        }catch (Exception e){
            e.printStackTrace();