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

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseCommitteeDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.area;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +15,7 @@ import javax.persistence.Table;
*/
@Entity
@Table(name = "base_committee")
public class BaseCommitteeDO extends UuidIdentityEntityWithOperator {
public class BaseCommitteeDO extends IntegerIdentityEntity {
    /**
	 * 省标识

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -461,6 +461,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/baseStreet";
    }
    /**
     * 居委会字典
     */
    public static class BaseCommittee extends Basic {
        public static final String PREFIX  = "/baseCommittee";
    }
    /**
     * 团队成员

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/area/BaseCommitteeVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.area;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty;
 * @since 1.
 */
@ApiModel(value = "BaseCommitteeVO", description = "居委会")
public class BaseCommitteeVO extends UuidIdentityVOWithOperator {
public class BaseCommitteeVO extends IntegerIdentityEntity {
    /**
	 * 省标识

svr/svr-base/src/main/java/com/yihu/jw/base/dao/patient/PatientMedicareCardDao.java

@@ -2,6 +2,7 @@ package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -12,4 +13,7 @@ import java.util.List;
public interface PatientMedicareCardDao extends PagingAndSortingRepository<PatientMedicareCardDO, String>, JpaSpecificationExecutor<PatientMedicareCardDO> {
    List<PatientMedicareCardDO> findByPatientCode(String patientCode);
    @Query("select id from PatientMedicareCardDO where patientCode = ?1")
    List<Object> findIdListByPatientCode(String patientCode);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCommitteeEndpoint.java

@@ -0,0 +1,104 @@
package com.yihu.jw.base.endpoint.area;
import com.yihu.jw.base.service.area.BaseCommitteeService;
import com.yihu.jw.entity.base.area.BaseCommitteeDO;
import com.yihu.jw.restmodel.base.area.BaseCommitteeVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 居委会字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseCommittee.PREFIX)
@Api(value = "居委会字典管理", description = "居委会字典管理服务接口", tags = {"wlyy基础服务 -居委会字典管理服务接口"})
public class BaseCommitteeEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseCommitteeService baseCommitteeService;
@PostMapping(value = BaseRequestMapping.BaseCommittee.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseCommitteeVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseCommitteeDO BaseCommittee = toEntity(jsonData, BaseCommitteeDO.class);
    BaseCommittee = baseCommitteeService.save(BaseCommittee);
    return success(BaseCommittee, BaseCommitteeVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseCommittee.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseCommitteeService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseCommittee.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseCommitteeVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseCommitteeDO BaseCommittee = toEntity(jsonData, BaseCommitteeDO.class);
        if (null == BaseCommittee.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        BaseCommittee = baseCommitteeService.save(BaseCommittee);
        return success(BaseCommittee, BaseCommitteeVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseCommittee.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseCommitteeVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BaseCommitteeDO> baseProvinces = baseCommitteeService.search(fields, filters, sorts, page, size);
                int count = (int)baseCommitteeService.getCount(filters);
                return success(baseProvinces, count, page, size, BaseCommitteeVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseCommittee.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseCommitteeVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseCommitteeDO> baseProvinces = baseCommitteeService.search(fields, filters, sorts);
                  return success(baseProvinces, BaseCommitteeVO.class);
         }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@@ -7,7 +7,6 @@ import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.restmodel.base.system.SystemDictVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -29,20 +27,10 @@ import java.util.List;
@RequestMapping(value = BaseRequestMapping.SystemDict.PREFIX)
@Api(value = "系统字典", description = "系统字典服务接口", tags = {"wlyy基础服务 - 系统字典服务接口"})
public class SystemDictEndpoint extends EnvelopRestEndpoint {
    
    @Autowired
    private SystemDictService systemDictService;
    @PostMapping(value = BaseRequestMapping.SystemDict.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SystemDictVO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SystemDictDO systemDictDO = toEntity(jsonData, SystemDictDO.class);
        systemDictDO = systemDictService.save(systemDictDO);
        return success(systemDictDO, SystemDictVO.class);
    }
    @PostMapping(value = BaseRequestMapping.SystemDict.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
@@ -52,11 +40,11 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SystemDict.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SystemDict.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
    public Envelop update(
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
            @RequestParam String jsonData) throws Exception {
        SystemDictDO systemDictDO = toEntity(jsonData, SystemDictDO.class);
        if (null == systemDictDO.getCode()) {
            return failed("ID不能为空", Envelop.class);
@@ -67,7 +55,7 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.SystemDict.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<SystemDictVO> page (
    public PageEnvelop<SystemDictVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -79,13 +67,13 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<SystemDictDO> systemDictDOS = systemDictService.search(fields, filters, sorts, page, size);
        int count = (int)systemDictService.getCount(filters);
        int count = (int) systemDictService.getCount(filters);
        return success(systemDictDOS, count, page, size, SystemDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.SystemDict.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<SystemDictVO> list (
    public ListEnvelop<SystemDictVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -96,14 +84,14 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
        return success(systemDictDOS, SystemDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.SystemDict.ALL)
    @PostMapping(value = BaseRequestMapping.SystemDict.CREATE)
    @ApiOperation(value = "新增系统字典")
    public Envelop createSystemDict (
    public Envelop createSystemDict(
            @ApiParam(name = "jsonData", value = "json数据，系统字典及其值")
            @RequestParam(value = "jsonData", required = true) String jsonData) throws Exception {
         String message = systemDictService.createSystemDict(jsonData);
         if(StringUtils.equalsIgnoreCase(message,ConstantUtils.SUCCESS)){
             return success(message);
        String message = systemDictService.createSystemDict(jsonData);
        if (StringUtils.equalsIgnoreCase(message, ConstantUtils.SUCCESS)) {
            return success(message);
        }
        return failed(message);
    }
@@ -140,7 +128,7 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size
    ) throws Exception {
        JSONArray list = systemDictService.getDistListByType(type,userId,sorts,page,size);
        JSONArray list = systemDictService.getDistListByType(type, userId, sorts, page, size);
        return success(list);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/patient/BasePatientService.java

@@ -138,6 +138,7 @@ public class BasePatientService extends BaseJpaService<BasePatientDO, BasePatien
        }
        // 保存修改的居民信息
        this.save(basePatientDO);
        // 一条一条修改居民相关的卡的信息
        for (Object obj: patientMedicareCards){
            PatientMedicareCardDO card = objectMapper.readValue(obj.toString(),PatientMedicareCardDO.class);

svr/svr-base/src/main/java/com/yihu/jw/base/service/patient/PatientMedicardCardService.java

@@ -28,6 +28,11 @@ public class PatientMedicardCardService extends BaseJpaService<PatientMedicareCa
    @Autowired
    private PatientMedicareCardDao patientMedicareCardDao;
    /**
     * 根据居民标识获取居民医疗相关卡列表
     * @param patientCode
     * @return
     */
    public List<PatientMedicareCardDO> findPatientCardByCode(String patientCode){
        List<PatientMedicareCardDO> result = new ArrayList<>();
        if(StringUtils.isEmpty(patientCode)){
@@ -36,4 +41,6 @@ public class PatientMedicardCardService extends BaseJpaService<PatientMedicareCa
        return patientMedicareCardDao.findByPatientCode(patientCode);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictService.java

@@ -19,6 +19,7 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.criteria.Order;
import java.text.ParseException;
@@ -130,6 +131,7 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
     }
     *
     */
    @Transactional(rollbackFor = Exception.class)
    public String createSystemDict(String jsonData) throws Exception{
        if(StringUtils.isEmpty(jsonData)){
            return "none params(jsonData)";