提交统计分支代码

src/main/java/com/yihu/wlyy/entity/WlyySignFamilyCode.java

@@ -23,6 +23,7 @@ public class WlyySignFamilyCode implements java.io.Serializable {
	private String orgName;
	private Integer sequence;
	private Date modifyTime;
	private String year;
	// Constructors
@@ -93,5 +94,12 @@ public class WlyySignFamilyCode implements java.io.Serializable {
		this.modifyTime = modifyTime;
	}
	@Column(name = "year" , length = 10)
	public String getYear() {
		return year;
	}
	public void setYear(String year) {
		this.year = year;
	}
}

src/main/java/com/yihu/wlyy/repository/WlyySignFamilyCodeDao.java

@@ -14,4 +14,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface WlyySignFamilyCodeDao  extends PagingAndSortingRepository<WlyySignFamilyCode, String>, JpaSpecificationExecutor<WlyySignFamilyCode> {
    @Query(" FROM WlyySignFamilyCode a WHERE a.orgCode =?1 ")
    WlyySignFamilyCode findByOrgCode(String hospital);
    @Query(" FROM WlyySignFamilyCode a WHERE a.orgCode =?1 and a.year=?2 ")
    WlyySignFamilyCode findByOrgCodeAndYear(String hospital, String year);
}

src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -104,6 +104,9 @@ public class ConsultTeamService extends ConsultService {
		case 4:
			// 已完成的
			return findByDoctorType4(uid, id, pagesize);
		case 5:
			// 名医咨询
			return findByDoctorType1(uid, type, id, pagesize);
		}
		return null;
	}

src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1338,7 +1338,7 @@ public class FamilyContractService extends BaseService {
        String year = DateUtil.getStringDate(DateUtil.YY);
        Hospital hospital1 = hospitalDao.findByCode(hospital);
        Integer amount=0;
        WlyySignFamilyCode wlyySignFamilyCode = wlyySignFamilyCodeDao.findByOrgCode(hospital);
        WlyySignFamilyCode wlyySignFamilyCode = wlyySignFamilyCodeDao.findByOrgCodeAndYear(hospital,year);
        if(wlyySignFamilyCode!=null){
            amount=wlyySignFamilyCode.getSequence()+1;
            wlyySignFamilyCode.setSequence(amount);
@@ -1350,10 +1350,11 @@ public class FamilyContractService extends BaseService {
            wlyySignFamilyCodeTemp.setModifyTime(new Date());
            wlyySignFamilyCodeTemp.setOrgCode(hospital1.getCode());
            wlyySignFamilyCodeTemp.setOrgName(hospital1.getName());
            wlyySignFamilyCodeTemp.setYear(year);
            wlyySignFamilyCodeTemp.setSequence(1);
            wlyySignFamilyCodeDao.save(wlyySignFamilyCodeTemp);
        }
        return year + hospital1.getRoadCode() + hospital1.getCenterSite() + StringUtils.leftPad(String.valueOf(amount + 1), 6, "0");
        return year + hospital1.getRoadCode() + hospital1.getCenterSite() + "Y"+StringUtils.leftPad(String.valueOf(amount + 1), 5, "0");
    }
    public int countAmountSigned2(String uid) {

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -46,7 +46,7 @@ public class DoctorConsultController extends WeixinBaseController {
	/**
	 * 三师咨询列表查询
	 * @param type 咨询类型：0、全部，1、咨询我的，2、公共的， 3、参与过的，4、已结束的
	 * @param type 咨询类型：0、全部，1、咨询我的，2、公共的， 3、参与过的，4、已结束的  5 名医咨询 全部  6 名医咨询 进行中 7 名医咨询 已结束
	 * @param id
	 * @param pagesize 每页显示数，默认为10
	 * @return

src/main/java/com/yihu/wlyy/web/doctor/device/DoctorDeviceController.java

@@ -79,7 +79,7 @@ public class DoctorDeviceController extends BaseController {
	@RequestMapping(value = "DeletePatientDevice",method = RequestMethod.DELETE)
	@ResponseBody
	public String delete(@ApiParam(name="id",value="删除设备关联ID")
						  @RequestParam(value="id",required = true) String id) {
						 @RequestParam(value="id",required = true) String id) {
		try {
			PatientDevice pd = patientDeviceService.findById(id);
			if(pd!=null)
@@ -98,4 +98,36 @@ public class DoctorDeviceController extends BaseController {
			return invalidUserException(ex, -1,ex.getMessage());
		}
	}
	@ApiOperation("获取患者设备信息")
	@RequestMapping(value = "PatientDeviceInfo",method = RequestMethod.GET)
	@ResponseBody
	public String getPatientDeviceInfo(@ApiParam(name="id",value="患者设备ID",defaultValue = "34")
									   @RequestParam(value="id",required = true) String id) {
		try {
			PatientDevice device = patientDeviceService.findById(id);
			return write(200, "查询成功", "data", device);
		} catch (Exception ex) {
			return invalidUserException(ex, -1, ex.getMessage());
		}
	}
	@ApiOperation("通过sn码获取设备绑定情况")
	@RequestMapping(value = "PatientDeviceIdcard",method = RequestMethod.GET)
	@ResponseBody
	public String getDeviceUser(
			@ApiParam(name="patient",value="患者code",defaultValue = "915cca0a-5b1d-11e6-8344-fa163e8aee56")
			@RequestParam(value="patient",required = true) String patient,
			@ApiParam(name="type",value="设备类型",defaultValue = "1")
			@RequestParam(value="type",required = true) String type,
			@ApiParam(name="device_sn",value="设备SN码",defaultValue = "15L000002")
			@RequestParam(value="device_sn",required = true) String deviceSn) {
		try {
			List<Map<String,String>> list = patientDeviceService.getDeviceUser(patient,deviceSn,type);
			return write(200, "获取设备绑定信息成功！", "data",list);
		} catch (Exception ex) {
			return invalidUserException(ex, -1, ex.getMessage());
		}
	}
}