代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServiceItemPlanDO.java

@@ -18,10 +18,10 @@ public class ServiceItemPlanDO extends UuidIdentityEntityWithCreateTime {
    private String status;//状态0未完成 1已完成
    private String planTime;//计划时间
    private String completeTime;//完成时间
    private String signId;//签约id
    private String servicePackId;//服务包id
    private String serviceItemId;//服务项id
    private String itemConfigId;//服务项配置id
    private String doctor;//医生id
    private String doctorName;//医生姓名
    private String planId;//康复计划id
    private String planDetailId;//康复计划明细id
    private String name;//服务项名称
    private String relationCode;//关联业务id
    private String relationType;//关联业务类型 doorService上门服务
@@ -44,39 +44,37 @@ public class ServiceItemPlanDO extends UuidIdentityEntityWithCreateTime {
        this.status = status;
    }
    @Column(name = "sign_id")
    public String getSignId() {
        return signId;
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setSignId(String signId) {
        this.signId = signId;
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "service_pack_id")
    public String getServicePackId() {
        return servicePackId;
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setServicePackId(String servicePackId) {
        this.servicePackId = servicePackId;
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    @Column(name = "service_item_id")
    public String getServiceItemId() {
        return serviceItemId;
    @Column(name = "plan_id")
    public String getPlanId() {
        return planId;
    }
    public void setServiceItemId(String serviceItemId) {
        this.serviceItemId = serviceItemId;
    public void setPlanId(String planId) {
        this.planId = planId;
    }
    @Column(name = "item_config_id")
    public String getItemConfigId() {
        return itemConfigId;
    @Column(name = "plan_detail_id")
    public String getPlanDetailId() {
        return planDetailId;
    }
    public void setItemConfigId(String itemConfigId) {
        this.itemConfigId = itemConfigId;
    public void setPlanDetailId(String planDetailId) {
        this.planDetailId = planDetailId;
    }
    @Column(name = "name")
    public String getName() {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/dao/ServiceItemPlanDao.java

@@ -8,20 +8,14 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
/**
 * Created by yeshijie on 2023/10/28.
 */
public interface ServiceItemPlanDao extends PagingAndSortingRepository<ServiceItemPlanDO, String>, JpaSpecificationExecutor<ServiceItemPlanDO> {
    @Query("from ServiceItemPlanDO w where w.signId =?1 ")
    List<ServiceItemPlanDO> findBySignId(String signId);
    @Query(value = "select * from base_service_item_plan w where w.sign_id =?1 and w.service_item_id=?2 order by w.plan_time desc", nativeQuery = true)
    List<ServiceItemPlanDO> findBySignIdAndServiceItemId(String signId, String serviceItemId);
    @Modifying
    @Query(value ="UPDATE  base_service_item_plan SET status='1' ,complete_time=?3 WHERE status='0' AND sign_id=?1 AND service_pack_id=?2 ORDER BY plan_time DESC LIMIT 1", nativeQuery = true)
    void updateState(String signId, String packageId, Date date);
    @Query(value ="UPDATE  base_service_item_plan SET status='1' ,complete_time=?3 WHERE status='0' AND plan_id=?1 AND plan_detail_id=?2 ORDER BY plan_time DESC LIMIT 1", nativeQuery = true)
    void updateState(String planId, String planDetailId, Date date);
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorOrderService.java

@@ -1402,7 +1402,7 @@ public class DoorOrderService {
        String packageId = one.getPackageId();//服务包id
        Date date = new Date();
        //更新计划状态为完成
        serviceItemPlanDao.updateState(signId, packageId, date);
//        serviceItemPlanDao.updateState(signId, packageId, date);
        WlyyDoorServiceOrderDO doorServiceOrderDO = this.getDoorServiceOrderById(orderId, level);

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/DoctorRehabilitaionInfoController.java

@@ -46,7 +46,7 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(SpecialistMapping.api_success, list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -97,7 +97,7 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            List<Map<String, Object>> list = rehabilitationInfoService.getRehabilitationPatientCountNew(doctorId);
            return write(200, "请求成功", "data", list);
        } catch (Exception e) {
            return error(-1, e.getMessage());
            return error(-1, "查询失败");
        }
    }

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

@@ -1255,9 +1255,9 @@ public class RehabilitationInfoService {
                "	CASE \n" +
                "		WHEN d.`status`='0' THEN '未下转'\n" +
                "		WHEN d.`status`='1' THEN '待分配'\n" +
                "		WHEN d.`status`='2' THEN '创建计划过程失败'\n" +
                "		WHEN d.`status`='3' THEN '患者无住院病历信息'\n" +
                "		WHEN d.`status`='5' THEN '同步居民失败'\n" +
//                "		WHEN d.`status`='2' THEN '创建计划过程失败'\n" +
//                "		WHEN d.`status`='3' THEN '患者无住院病历信息'\n" +
//                "		WHEN d.`status`='5' THEN '同步居民失败'\n" +
                "		WHEN d.`status`='7' THEN '已管理'\n" +
                "  END 'statusName',\n" +
                "  d.`status`,count(1) 'count' \n" +

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

@@ -73,7 +73,8 @@ public class RehabilitationManageService {
    private BasePatientDao patientDao;
    @Autowired
    private PatientMedicalRecordsRehabilitationDao medicalRecordsRehabilitationDao;
    @Autowired
    private RehabilitationPatientInfoDao rehabilitationPatientInfoDao;
    @Autowired
    private PatientDiseaseServerDao patientDiseaseServerDao;
    @Autowired
@@ -125,12 +126,19 @@ public class RehabilitationManageService {
                detailDO.setDoctorName(newDetail.getDoctorName());
                detailDO.setDept(newDetail.getDept());
                detailDO.setDeptName(newDetail.getDeptName());
                //生成执行计划列表
            }
        }
        rehabilitationDetailDao.saveAll(detailDOS);
        planDO1.setStatus(1);
        patientRehabilitationPlanDao.save(planDO1);
        addPlanLog(planDO.getId(),uid,null);
        //更新状态
        if(StringUtils.isNotBlank(planDO1.getPatientInfoCode())){
            RehabilitationPatientInfoDO infoDO = rehabilitationPatientInfoDao.findByCode(planDO1.getPatientInfoCode());
            infoDO.setStatus(7);
            rehabilitationPatientInfoDao.save(infoDO);
        }
    }
    public List<Map<String, Object>> selectPlanByPatient(String patient, Integer status, String planId, String doctor) {

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

@@ -357,7 +357,6 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
        rehabilitationManageService.addPlanLog(planDO.getId(), planDO.getPlanDoctor(), planDO.getPlanDoctorName());
        if (StringUtils.isNotBlank(patientInfoCode)) {
            RehabilitationPatientInfoDO infoDO = rehabilitationPatientInfoDao.findByCode(patientInfoCode);
            System.out.println("infoDO==>" + infoDO);
            if (StringUtils.isBlank(infoDO.getDiagnosis())) {
                infoDO.setDept(recordsDO.getDept());
                infoDO.setDeptName(recordsDO.getDeptName());