Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/assistance/EmergencyAssistanceDao.java

@@ -16,4 +16,6 @@ public interface EmergencyAssistanceDao extends PagingAndSortingRepository<Emerg
    List<EmergencyAssistanceDO> queryByPatientAndStatusIn(String patient, Integer[] status, Sort sort);
    EmergencyAssistanceDO findByPatientAndStatus(String patient,Integer status);
    EmergencyAssistanceDO findByProxyPatientAndStatus(String proxyPatient,Integer status);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/security/SecurityMonitoringOrderDao.java

@@ -21,4 +21,9 @@ public interface SecurityMonitoringOrderDao extends PagingAndSortingRepository<S
    @Transactional
    @Query("update SecurityMonitoringOrderDO o set o.conclusionStatus = 1,o.status='4' where o.id=?1")
    void updateConclusionStatus(String orderId);
    @Modifying
    @Transactional
    @Query("update SecurityMonitoringOrderDO o set o.conclusionStatus = 1 where o.id=?1")
    void updateConclusionStatus2(String orderId);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/team/BaseTeamMemberDao.java

@@ -44,6 +44,8 @@ public interface BaseTeamMemberDao extends PagingAndSortingRepository<BaseTeamMe
    BaseTeamMemberDO findByTeamCodeAndDoctorCode(String teamCode, String doctorCode);
    BaseTeamMemberDO findByTeamCodeAndDoctorCodeAndDel(String teamCode, String doctorCode,String del);
    @Modifying
    @Query("update BaseTeamMemberDO t SET t.del = '0' where t.id = :id")
    void deleteById(@Param("id") String id);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/assistance/EmergencyAssistanceEndpoint.java

@@ -112,7 +112,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "existApplyStatus")
    @ApiOperation(value = "查看居民救助状态是否在申请中")
    public ObjEnvelop existApplyStatus(@ApiParam(name="patient",value = "患者")
    public ObjEnvelop existApplyStatus(@ApiParam(name="patient",value = "患者(代预约家人为主)")
                                    @RequestParam(value = "patient") String patient){
        try {
            JSONObject result = assistanceService.existApplyStatus(patient);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/family/FamilyMemberEndpoint.java

@@ -150,7 +150,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
    }
    @RequestMapping(value = "/member_authorize", method = RequestMethod.POST)
    @ApiOperation(value = "家庭成员授权")
    @ApiOperation(value = "家庭成员授权--已废弃不需要做授权操作")
    public Envelop authorizeMember(@ApiParam(name = "familyMember", value = "家人code", defaultValue ="1555c32c626343e7aaa62e9cf76c97f2")
                                  @RequestParam(value = "familyMember", required = true) String familyMember,
                                  @ApiParam(name = "isAuthorize", value = "是否授权（0:未授权,1:已授权）", defaultValue ="1")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -344,7 +344,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
    public JSONObject existApplyStatus(String patient){
        JSONObject result = new JSONObject();
        JSONObject tmpObj = new JSONObject();
        EmergencyAssistanceDO assistanceDO = emergencyAssistanceDao.findByPatientAndStatus(patient,1);
        EmergencyAssistanceDO assistanceDO = emergencyAssistanceDao.findByProxyPatientAndStatus(patient,1);
        if (assistanceDO==null){
            tmpObj.put("exist","false");
            result.put(ResponseContant.resultFlag, ResponseContant.success);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -73,7 +73,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
    private Logger logger = LoggerFactory.getLogger(SecurityMonitoringOrderService.class);
    public JSONObject createOrder(String jsonData){
        logger.info("创建上门服务jsonData参数：" + jsonData);
        logger.info("创建安防工单jsonData参数：" + jsonData);
        JSONObject result = new JSONObject();
        JSONObject jsonObjectParam;
@@ -707,7 +707,9 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        }
        securityMonitoringConclusionDao.save(doorConclusion);
        // 设置是否需要上传补录报告
        one.setStatus(SecurityMonitoringOrderDO.Status.registerSummary.getType());//已登记服务小结
        if (!(one.getStatus()==SecurityMonitoringOrderDO.Status.complete.getType())){
            one.setStatus(SecurityMonitoringOrderDO.Status.registerSummary.getType());//已登记服务小结
        }
        one.setExamPaperStatus(examPapeStatus);
        one.setConclusionStatus(2);
        securityMonitoringOrderDao.save(one);
@@ -719,7 +721,20 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
     * @param orderId
     */
    public JSONObject cancelConclusion(String orderId) {
        securityMonitoringOrderDao.updateConclusionStatus(orderId);
        JSONObject result = new JSONObject();
        SecurityMonitoringOrderDO one = securityMonitoringOrderDao.findOne(orderId);
        if (one==null){
            String failMsg = "工单不存在" ;
            result.put("resultFlag", 0);
            result.put("resultMsg", failMsg);
            return result;
        }
        if (one.getStatus()==SecurityMonitoringOrderDO.Status.complete.getType()){//修改工单记录
            securityMonitoringOrderDao.updateConclusionStatus2(orderId);
        }
        else {
            securityMonitoringOrderDao.updateConclusionStatus(orderId);
        }
        return getSecurityOrderDetail(orderId);
    }
@@ -878,7 +893,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        //获取患者签约防走失服务的团队
        String sql="SELECT DISTINCT i.team_code from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i  \n" +
                "where  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id   and i.del = 1 and sr.`status`=1 \n" +
                "and  sr.patient  = '"+patient+"' and i.code=preventLost";
                "and  sr.patient  = '"+patient+"' and i.code='preventLost'";
        List<String> teams = jdbcTemplate.queryForList(sql,String.class);
        List<Map<String,Object>> result = new ArrayList<>();
        if (teams.size()==0){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/team/BaseTeamService.java

@@ -170,7 +170,7 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
     * @param doctorCode
     */
    public void removeMember(String teamCode, String doctorCode) {
        BaseTeamMemberDO member = memberDao.findByTeamCodeAndDoctorCode(teamCode, doctorCode);
        BaseTeamMemberDO member = memberDao.findByTeamCodeAndDoctorCodeAndDel(teamCode, doctorCode,"1");
        if (member != null){
            memberDao.delete(member);
        }