Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/doctor/DoctorSynergyManageController.java

@@ -110,9 +110,13 @@ public class DoctorSynergyManageController extends BaseController {
    @RequestMapping(value = "selectByWorkorderCode", method = RequestMethod.POST)
    @ApiOperation("医生端-居民列表")
    public String selectByWorkorderCode(@ApiParam(name = "workorderCode", value = "工单code", required = false)
                           @RequestParam(value = "workorderCode", required = false)String workorderCode){
                                            @RequestParam(value = "workorderCode", required = false)String workorderCode,
                                        @ApiParam(name = "page", value = "页码", defaultValue = "1")
                                        @RequestParam(value = "page", required = false)Integer page,
                                        @ApiParam(name = "size", value = "每页大小", defaultValue = "10")
                                            @RequestParam(value = "size", required = false)Integer size){
        try {
            return write(200, "请求成功","data",workorderServicerLogService.selectByWorkorderCode(workorderCode));
            return write(200, "请求成功","data",workorderServicerLogService.selectByWorkorderCode(workorderCode,page,size));
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyWorkorderServicerLogService.java

@@ -2,10 +2,13 @@ package com.yihu.wlyy.service.synergy;/**
 * Created by nature of king on 2018/10/9.
 */
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerLogDO;
import com.yihu.wlyy.repository.PatientDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkOrderDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderServicerLogDao;
import com.yihu.wlyy.util.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * @author wangzhinan
@@ -29,6 +33,8 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
    @Autowired
    private ManageSynergyWorkorderServicerLogDao manageSynergyWorkorderServicerLogDao;
    @Autowired
    private ManageSynergyWorkOrderDao manageSynergyWorkOrderDao;
    @Autowired
    private PatientDao patientDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
@@ -42,7 +48,14 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
     */
    public void create(ManageSynergyWorkorderServicerLogDO synergyWorkorderServicerLogDO){
        synergyWorkorderServicerLogDO.setCreateTime(new Date());
        manageSynergyWorkorderServicerLogDao.save(synergyWorkorderServicerLogDO);
        ManageSynergyWorkorderServicerLogDO workorderServicerLogDO = manageSynergyWorkorderServicerLogDao.save(synergyWorkorderServicerLogDO);
        String sql = "select * from manage_synergy_workorder_servicer where workorder_code = '"+workorderServicerLogDO.getWorkorderCode()+"' and status IN(1,2)";
        List<ManageSynergyWorkorderServicerLogDO> workorderServicerLogDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ManageSynergyWorkorderServicerLogDO.class));
        if (workorderServicerLogDOS == null || workorderServicerLogDOS.size() == 0){
            ManageSynergyWorkorderDO workorderDO = manageSynergyWorkOrderDao.findByCode(workorderServicerLogDO.getWorkorderCode());
            workorderDO.setStatus(3);
            manageSynergyWorkOrderDao.save(workorderDO);
        }
    }
@@ -52,14 +65,25 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
     * @param workorderCode 工单code
     * @return
     */
    public List<Patient> selectByWorkorderCode(String workorderCode){
        String sql = "select * from manage_synergy_workorder_servicer where workorder_code = '"+workorderCode+"'";
    public JSONObject selectByWorkorderCode(String workorderCode, Integer page, Integer size){
        JSONObject object = new JSONObject();
        String sql = "select * from manage_synergy_workorder_servicer where workorder_code = '"+workorderCode+"' LIMIT "+(page-1)*size+","+size;
        List<ManageSynergyWorkorderServicerDO> workorderServicerDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ManageSynergyWorkorderServicerDO.class));
        String sqlCount = "select count(1) as total from manage_synergy_workorder_servicer where workorder_code = '"+workorderCode+"'";
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sqlCount);
        Long count = 0L;
        if(rstotal!=null&&rstotal.size()>0){
            count = (Long) rstotal.get(0).get("total");
        }
        List<Patient> patients = new ArrayList<>();
        for (ManageSynergyWorkorderServicerDO workorderServicerDO:workorderServicerDOS){
            Patient patient = patientDao.findByCode(workorderServicerDO.getServicePatientCode());
            patients.add(patient);
        }
        return patients;
        object.put("currPage",page);
        object.put("pageSize",size);
        object.put("totalCount",count);
        object.put("detailModelList",patients);
        return object;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/synergy/ManageSynergyService.java

@@ -183,19 +183,22 @@ public class ManageSynergyService extends BaseService {
     * @return
     * @throws Exception
     */
    public String selectByWorkorderCode(String workorderCode) throws Exception{
    public String selectByWorkorderCode(String workorderCode,Integer page,Integer size) throws Exception{
        String response = null;
        Map<String, String> params = new HashMap<>();
        params.put("workorderCode",workorderCode);
        params.put("page",page.toString());
        params.put("size",size.toString());
        String url = customerUrl + "/synergy/doctor/selectByWorkorderCode";
        com.alibaba.fastjson.JSONObject object = null;
        try {
            response = httpClientUtil.httpPost(url,params);
            object = JSON.parseObject(response);
            JSONArray array = object.getJSONArray("data");
            com.alibaba.fastjson.JSONObject jsonObject1 = object.getJSONObject("data");
            JSONArray array = jsonObject1.getJSONArray("detailModelList");
            for (int i=0;i<array.size();i++){
                com.alibaba.fastjson.JSONObject jsonObject = array.getJSONObject(i);
                jsonObject.put("birth", IdCardUtil.getAgeForIdcard(jsonObject.getString("idcard")));
                jsonObject.put("age", IdCardUtil.getAgeForIdcard(jsonObject.getString("idcard")));
            }
        } catch (Exception e) {
            e.printStackTrace();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -13,7 +13,6 @@ import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.util.http.HttpResponse;
import com.yihu.wlyy.util.http.HttpUtils;
@@ -24,6 +23,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -114,7 +115,8 @@ public class SynergyManageService extends BaseService {
                followup.setSignType(Integer.parseInt(signFamily.getSignType()));
                followup.setSignCode(signFamily.getCode());
            }
            followup.setFollowupDate(DateUtil.strToDate(serviceDate));
            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            followup.setFollowupDate(dateFormat.parse(serviceDate+":00"));
            followup.setFollowupType(followupType);
            followup.setFollowupClass(followupClass);
            followup.setOrgCode(doctor1.getHospital());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/synergy/SynergyManageController.java

@@ -161,9 +161,13 @@ public class SynergyManageController extends BaseController {
    @RequestMapping(value = "selectByWorkorderCode", method = RequestMethod.POST)
    @ApiOperation("医生端-居民列表")
    public String selectByWorkorderCode(@ApiParam(name = "workorderCode", value = "工单code", required = false)
                                        @RequestParam(value = "workorderCode", required = false)String workorderCode){
                                        @RequestParam(value = "workorderCode", required = false)String workorderCode,
                                        @ApiParam(name = "page", value = "页码", defaultValue = "1")
                                        @RequestParam(value = "page", required = false)Integer page,
                                        @ApiParam(name = "size", value = "每页大小", defaultValue = "10")
                                            @RequestParam(value = "size", required = false)Integer size){
        try {
            return write(200, "请求成功","data",manageSynergyService.selectByWorkorderCode(workorderCode));
            return write(200, "请求成功","data",manageSynergyService.selectByWorkorderCode(workorderCode,page,size));
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");