Merge branch 'master' of gitee.com:shanghai_heng_ge_information/long-term-care

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ism.service.DisableService;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
-import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
-import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
+import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -36,8 +34,8 @@ public class DisableController {
      * @param districtCode  上级区域代码
      */
     @RequestMapping("/district")
-    public Result<List<ChFndDistrict>> district(String districtLevel, String districtCode) {
-        List<ChFndDistrict> districts = disableService.district(districtLevel, districtCode);
+    public Result<List<ChFndDistrict>> district(String districtLevel, String districtName) {
+        List<ChFndDistrict> districts = disableService.district(districtLevel, districtName);
         return Result.success(districts);
     }
 
@@ -51,6 +49,26 @@ public class DisableController {
     }
 
     /**
+     * 查询所有服务方式
+     */
+    @RequestMapping("/fndSrvMode")
+    public Result<List<ChFndSrvMode>> fndSrvMode() {
+        List<ChFndSrvMode> fndSrvModes = disableService.fndSrvModeList();
+        return Result.success(fndSrvModes);
+    }
+
+    /**
+     * 查询机构下所有护理机构
+     *
+     * @param organId 机构id
+     */
+    @RequestMapping("/srvOrganList")
+    public Result<List<ChSrvOrgan>> srvOrganList(String organId) {
+        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(organId);
+        return Result.success(chFndSrvModes);
+    }
+
+    /**
      * 失能人员信息列表
      *
      * @param organId               适用机构代码

apply/apply-service/src/main/java/com/hungraim/ism/dao/FndSrvModeMapper.java

+package com.hungraim.ism.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChFndSrvMode;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 服务项目分类信息表Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface FndSrvModeMapper extends BaseMapper<ChFndSrvMode> {
+}

apply/apply-service/src/main/java/com/hungraim/ism/dao/SrvOrganMapper.java

+package com.hungraim.ism.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 护理机构Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface SrvOrganMapper extends BaseMapper<ChSrvOrgan> {
+}

apply/apply-service/src/main/java/com/hungraim/ism/service/DisableService.java

@@ -3,9 +3,7 @@ package com.hungraim.ism.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ism.pojo.vo.disable.DisableVO;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
-import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
-import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
+import com.hungraim.ltc.pojo.entity.disable.*;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -50,7 +48,19 @@ public interface DisableService {
 
     void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark);
 
-    List<ChFndDistrict> district(String districtLevel, String districtCode);
+    List<ChFndDistrict> district(String districtLevel, String districtName);
 
     List<ChFndOrgan> fndOrganRoot();
+
+    /**
+     * 查询所有服务方式
+     */
+    List<ChFndSrvMode> fndSrvModeList();
+
+    /**
+     * 查询机构下所有护理机构
+     *
+     * @param organId 机构id
+     */
+    List<ChSrvOrgan> srvOrganList(String organId);
 }

apply/apply-service/src/main/java/com/hungraim/ism/service/impl/DisableServiceImpl.java

@@ -3,18 +3,12 @@ package com.hungraim.ism.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.dao.DisableApplyMapper;
-import com.hungraim.ism.dao.FndDistrictMapper;
-import com.hungraim.ism.dao.FndOrganMapper;
-import com.hungraim.ism.dao.FndStreetMapper;
+import com.hungraim.ism.dao.*;
 import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
 import com.hungraim.ism.service.DisableService;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
-import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
-import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
-import com.hungraim.ltc.pojo.entity.disable.ChFndStreet;
+import com.hungraim.ltc.pojo.entity.disable.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +26,10 @@ public class DisableServiceImpl implements DisableService {
     private FndOrganMapper fndOrganMapper;
     @Autowired
     private FndStreetMapper fndStreetMapper;
+    @Autowired
+    private FndSrvModeMapper fndSrvModeMapper;
+    @Autowired
+    private SrvOrganMapper srvOrganMapper;
 
     /**
      * 获取机构ids
@@ -69,23 +67,6 @@ public class DisableServiceImpl implements DisableService {
             // 获取子孙机构集合
             if ("0".equals(isIncludeSubsidiaries)) {
                 this.getOrganList(organId, organIds);
-//            boolean flag = true;
-//            while (flag) {
-//                QueryWrapper<ChFndOrgan> queryWrapper = new QueryWrapper<>();
-//                queryWrapper.eq("STATUS", "1");
-//                queryWrapper.eq("PARENT_ID", organId);
-//                List<ChFndOrgan> organs = fndOrganMapper.selectList(queryWrapper);
-//                if (organs != null && organs.size() != 0) {
-//                    for (ChFndOrgan chFndOrgan : organs) {
-//                        organId = organId + "," + chFndOrgan.getOrganId();
-//                        if ("2".equals(chFndOrgan.getIsLeaf())) {
-//                            flag = false;
-//                        }
-//                    }
-//                } else {
-//                    flag = false;
-//                }
-//            }
             }
         }
         return disableApplyMapper.disableList(new Page<>(page, pageSize), organIds, isIncludeSubsidiaries, districtProvincial,
@@ -114,10 +95,10 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
-    public List<ChFndDistrict> district(String districtLevel, String districtCode) {
-        if ("4".equals(districtCode)) {
+    public List<ChFndDistrict> district(String districtLevel, String districtName) {
+        if ("4".equals(districtLevel)) {
             QueryWrapper<ChFndStreet> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("AREA_CODE", districtCode);
+            queryWrapper.eq("STREET_NAME", districtName);
             queryWrapper.eq("IS_VALID", 0);
             List<ChFndStreet> fndStreets = fndStreetMapper.selectList(queryWrapper);
             List<ChFndDistrict> resuts = new ArrayList<>();
@@ -133,7 +114,7 @@ public class DisableServiceImpl implements DisableService {
             queryWrapper.eq("IS_VALID", "Y");
             queryWrapper.eq("DISTRICT_LEVEL", districtLevel);
             if (!"1".equals(districtLevel)) {
-                queryWrapper.eq("PARENT_DISTIRCT_CODE", districtCode);
+                queryWrapper.eq("DISTRICT_NAME", districtName);
             }
             return districtMapper.selectList(queryWrapper);
         }
@@ -147,4 +128,14 @@ public class DisableServiceImpl implements DisableService {
         return fndOrganMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public List<ChFndSrvMode> fndSrvModeList() {
+        return fndSrvModeMapper.selectList(new QueryWrapper<>());
+    }
+
+    @Override
+    public List<ChSrvOrgan> srvOrganList(String organId) {
+        return srvOrganMapper.selectList(new QueryWrapper<ChSrvOrgan>().eq("organ_id", organId));
+    }
+
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChFndSrvMode.java

+package com.hungraim.ltc.pojo.entity.disable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 服务项目分类信息表
+ */
+@Data
+@TableName("CH_FND_SRV_MODE")
+public class ChFndSrvMode {
+    private Integer srvModeId;
+    private String srvModeName;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChSrvOrgan.java

+package com.hungraim.ltc.pojo.entity.disable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 护理机构表
+ */
+@Data
+@TableName("CH_SRV_ORGAN")
+public class ChSrvOrgan {
+    private Integer srvOrganId;
+    private String acptRoadDetail;
+    private String acptLongitude;
+    private String unifiedSocialCreditCode;
+    private String accName;
+    private String bankNo;
+    private Integer sTATUS;
+    private java.util.Date endTime;
+    private Integer acptRoadType;
+    private String acptProvincial;
+    private Integer webDefineEmp;
+    private Integer levelCode;
+    private String acptCity;
+    private Integer acptNumberType;
+    private Integer defineEmp;
+    private String checkRemarkCh;
+    private String adressDetail;
+    private java.util.Date fCD;
+    private Integer checkStatusCh;
+    private java.util.Date lCD;
+    private String acptNumberDetail;
+    private Integer dataFrom;
+    private String organId;
+    private String districtCity;
+    private Integer endEmp;
+    private Integer organTypeId;
+    private String linkName;
+    private String bankDistrictCity;
+    private Integer fCU;
+    private String bankAccCode;
+    private String bankDistrictProvincial;
+    private String srvOrganCode;
+    private Integer lCU;
+    private String checkRemarkLp;
+    private String srvType;
+    private String districtProvincial;
+    private String checkNameLp;
+    private Integer cardType;
+    private Integer checkStatusLp;
+    private Integer bUNK;
+    private String medicareNumber;
+    private String bankAccName;
+    private String linkTel;
+    private Integer webEndEmp;
+    private String districtArea;
+    private String linkMail;
+    private String permitId;
+    private String acptStreet;
+    private Integer cfgModeId;
+    private String rEMARK;
+    private String bankDistrictWebsite;
+    private String srvOrganName;
+    private java.util.Date checkTimeLp;
+    private String acptAddress;
+    private String checkNameCh;
+    private String acptLatitude;
+    private String acptArea;
+    private java.util.Date checkTimeCh;
+    private java.util.Date effTime;
+}