Inicio Explorar Axuda
Rexistro Iniciar sesión
trick9191
/
wlyy2.0
Fork de Amoy2/wlyy2.0
Seguir 1
Destacar 0
Fork 0
Ficheiros
Explorar o código

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/doctor/DoctorSynergyManageController.java
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java
wangzhinan %!s(int64=6) %!d(string=hai) anos
pai
36f0290316
achega
5df3f4fdb7
Modificáronse 2 ficheiros con 217 adicións e 0 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 130 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/synergy/SynergyManageService.java
  2. 87 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManageController.java

+ 130 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/synergy/SynergyManageService.java
Ver ficheiro 

@ -0,0 +1,130 @@
 
package com.yihu.wlyy.service.app.synergy;/**
 
 * Created by nature of king on 2018/10/9.
 
 */
 
import com.alibaba.fastjson.JSONArray;
 
import com.alibaba.fastjson.JSONObject;
 
import com.yihu.wlyy.entity.doctor.profile.Doctor;
 
import com.yihu.wlyy.entity.followup.Followup;
 
import com.yihu.wlyy.entity.organization.Hospital;
 
import com.yihu.wlyy.entity.patient.Patient;
 
import com.yihu.wlyy.entity.patient.SignFamily;
 
import com.yihu.wlyy.repository.doctor.DoctorDao;
 
import com.yihu.wlyy.repository.followup.FollowUpDao;
 
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 org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.stereotype.Service;
 
import org.springframework.transaction.annotation.Transactional;
 
import java.util.Date;
 
import java.util.HashMap;
 
import java.util.Map;
 
import java.util.Set;
 
/**
 
 * @author wangzhinan
 
 * @create 2018-10-09 10:16
 
 * @desc
 
 **/
 
@Service
 
@Transactional
 
public class SynergyManageService extends BaseService{
 
    @Value("${customerService.url}")
 
    private String customerUrl;
 
    @Autowired
 
    private HttpClientUtil httpClientUtil;
 
    @Autowired
 
    private PatientDao patientDao;
 
    @Autowired
 
    private DoctorDao doctorDao;
 
    @Autowired
 
    private SignFamilyDao signFamilyDao;
 
    @Autowired
 
    private FollowUpDao followUpDao;
 
    @Autowired
 
    private HospitalDao hospitalDao;
 
    public String createWorkorder(String doctor,Set<String> patientSet,Integer type,String objectId,String serviceDate,Integer priority,String remark,String followupClass,String followupType){
 
        String response = null;
 
        JSONArray array = new JSONArray();
 
        String patientCode1 = null;
 
        Doctor doctor1 = doctorDao.findByCode(doctor);
 
        for (String patientCode:patientSet){
 
            if (patientSet.size() == 1){
 
                patientCode1 = patientCode;
 
            }
 
            Patient patient = patientDao.findByCode(patientCode);
 
            JSONObject object = new JSONObject();
 
            object.put("servicePatientCode",patient.getCode());
 
            object.put("servicePatientName",patient.getName());
 
            object.put("ssc",patient.getSsc());
 
            object.put("idcard",patient.getIdcard());
 
            object.put("mobile",patient.getMobile());
 
            object.put("hospital",doctor1.getHospital());
 
            object.put("hospitalName",doctor1.getHospitalName());
 
            Hospital hospital = hospitalDao.findByCode(doctor1.getHospital());
 
            object.put("town", hospital.getTown());
 
            object.put("townName",hospital.getTownName());
 
            array.add(object);
 
        }
 
        JSONObject object = new JSONObject();
 
        object.put("type",type);
 
        object.put("serviceTime",serviceDate);
 
        object.put("priority",priority);
 
        object.put("createUser",doctor1.getCode());
 
        object.put("createUserName",doctor1.getName());
 
        object.put("hospital",doctor1.getHospital());
 
        object.put("hospitalName",doctor1.getHospitalName());
 
        object.put("createUserType",1);
 
        object.put("remark",remark);
 
        if (type == 3){
 
            Followup followup = new Followup();
 
            followup.setDoctorCode(doctor1.getCode());
 
            followup.setDoctorName(doctor1.getName());
 
            if (patientCode1 != null){
 
                Patient patient1 = patientDao.findByCode(patientCode1);
 
                followup.setPatientCode(patient1.getCode());
 
                followup.setPatientName(patient1.getName());
 
                followup.setIdcard(patient1.getIdcard());
 
                SignFamily signFamily = signFamilyDao.findByPatient(patientCode1);
 
                followup.setAdminTeamCode(signFamily.getAdminTeamId());
 
                followup.setSignType(Integer.parseInt(signFamily.getSignType()));
 
                followup.setSignCode(signFamily.getCode());
 
            }
 
            followup.setFollowupDate(DateUtil.strToDate(serviceDate));
 
            followup.setFollowupType(followupType);
 
            followup.setFollowupClass(followupClass);
 
            followup.setOrgCode(doctor1.getHospital());
 
            followup.setOrgName(doctor1.getHospitalName());
 
            followup.setDataFrom("2");
 
            followup.setStatus("2");
 
            followup.setCreater(doctor1.getCode());
 
            followup.setCreateTime(new Date());
 
            followup = followUpDao.save(followup);
 
            object.put("relationCode",followup.getId());
 
            object.put("relationCodeName","随访");
 
        }else if (type == 1){
 
            object.put("relationCode",objectId);
 
            object.put("relationCodeName","健康教育");
 
        }else if (type == 5){
 
            object.put("relationCode",objectId);
 
            object.put("relationCodeName","疾病筛查");
 
        }
 
        String url = customerUrl + "followup/saveFollowupProjectData";
 
        Map<String, String> params = new HashMap<>();
 
        params.put("servicers",array.toJSONString());
 
        try {
 
            response = httpClientUtil.httpPost(url,params);
 
        } catch (Exception e) {
 
            e.printStackTrace();
 
        }
 
        return response;
 
    }
 
}

+ 87 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManageController.java
Ver ficheiro 

@ -0,0 +1,87 @@
 
package com.yihu.wlyy.web.third.synergy;/**
 
 * Created by nature of king on 2018/10/8.
 
 */
 
import com.alibaba.fastjson.JSONArray;
 
import com.yihu.wlyy.aop.ObserverRequired;
 
import com.yihu.wlyy.service.app.followup.FollowUpService;
 
import com.yihu.wlyy.web.BaseController;
 
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.stereotype.Controller;
 
import org.springframework.web.bind.annotation.RequestMapping;
 
import org.springframework.web.bind.annotation.RequestMethod;
 
import org.springframework.web.bind.annotation.RequestParam;
 
import org.springframework.web.bind.annotation.ResponseBody;
 
/**
 
 * @author wangzhinan
 
 * @create 2018-10-08 13:56
 
 * @desc 协同管理
 
 **/
 
@Controller
 
@RequestMapping(value = "/followup", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 
@Api(description = "协同管理接口")
 
public class SynergyManageController extends BaseController{
 
    @Autowired
 
    private FollowUpService followUpService;
 
    @ApiOperation("新增临时随访记录（返回ID）")
 
    @RequestMapping(value = "/addFollowup", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 
    @ResponseBody
 
    @ObserverRequired
 
    public String addFollowup(@ApiParam(name = "doctor", value = "医生代码", defaultValue = "443a196ef8744536a531260eb26c05d7")
 
                                  @RequestParam(value = "doctor", required = true) String doctor,
 
                              @ApiParam(name = "patient", value = "患者代码", defaultValue = "443a196ef8744536a531260eb26c05d7")
 
                              @RequestParam(value = "patient", required = true) String patient,
 
                              @ApiParam(name = "date", value = "下次随访时间", defaultValue = "2016-12-15 20:00:00")
 
                              @RequestParam(value = "date", required = true) String date,
 
                              @ApiParam(name = "followupType", value = "随访方式【字典FOLLOWUP_WAY_DICT】", defaultValue = "12")
 
                              @RequestParam(value = "followupType", required = true) String followupType,
 
                              @ApiParam(name = "followupClass", value = "随访类别【1.高血压 2.糖尿病 3高糖】", defaultValue = "1")
 
                              @RequestParam(value = "followupClass", required = true) String followupClass,
 
                              @ApiParam(name = "followupManagerStatus", value = "随访管理状态【字典FOLLOWUP_MANAGER_STATUS】", defaultValue = "1")
 
                              @RequestParam(value = "followupManagerStatus", required = false) String followupManagerStatus,
 
                              @ApiParam(name = "plandate", value = "下次随访时间", defaultValue = "2016-12-14 20:00:00")
 
                              @RequestParam(value = "plandate", required = false) String plandate,
 
                              @ApiParam(name = "prescriptioncode", value = "续方CODE", defaultValue = "续方CODE")
 
                              @RequestParam(value = "prescriptioncode", required = false) String prescriptioncode) {
 
        try {
 
            String response = followUpService.addFollowup(doctor, patient, date, followupType, followupClass, followupManagerStatus,plandate,prescriptioncode);
 
            return write(200, "新增临时随访记录成功！", "data", response);
 
        } catch (Exception e) {
 
            error(e);
 
            return invalidUserException(e, -1, "新增临时随访记录失败！" + e.getMessage());
 
        }
 
    }
 
    @ApiOperation("保存随访项目数据")
 
    @RequestMapping(value = "/saveFollowupProjectData", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 
    @ResponseBody
 
    @ObserverRequired
 
    public String saveFollowupProjectData(@ApiParam(name = "followup", value = "随访项目对象")
 
                                          @RequestParam(value = "followup", required = true)String followup ) {
 
        try {
 
            JSONArray array = JSONArray.parseArray(followup);
 
//            followUpService.saveFollowupProjectData(id, followupProject, followupProjectData);
 
            //修改为通过ES查询---2017.11.01--huangwenjie
 
            for (int i =0;i<array.size();i++){
 
                String id = array.getJSONObject(i).getString("id");
 
                String followupProject = array.getJSONObject(i).getString("followupProject");
 
                String followupProjectData = array.getJSONObject(i).getString("followupProjectData");
 
                followUpService.esSaveFollowupProjectData(id, followupProject, followupProjectData);
 
            }
 
            return write(200, "保存随访项目数据成功！");
 
        } catch (Exception e) {
 
            error(e);
 
            return invalidUserException(e, -1, "保存随访项目数据失败！" + e.getMessage());
 
        }
 
    }
 
}