Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -547,11 +547,12 @@ public class PrenatalInspectorPreCardService extends BaseService {
     * 新建产检预建卡
     */
    @Transactional
    public String addPrenatalInspectorPreCard(PrenatalInspectorPreCard preCard,String patientCode){
    public JSONObject addPrenatalInspectorPreCard(PrenatalInspectorPreCard preCard,String patientCode){
        JSONObject json = new JSONObject();
        SignFamily signFamily = signFamilyDao.findByPatient(patientCode);
        if(signFamily==null){
            return "-1";
            json.put("code","-1");
            return json;
        }
        //判断是否有预建卡
@@ -565,13 +566,15 @@ public class PrenatalInspectorPreCardService extends BaseService {
                    JSONObject temp = preData.getJSONObject(0);
                    String END_MANNER = temp.getString("END_MANNER");//妊娠终止方式
                    if(StringUtils.isBlank(END_MANNER)){
                        return "-2";
                        json.put("code","-2");
                        return json;
                    }
                }
            }
        }catch (Exception e){
            e.printStackTrace();
            return "-3";
            json.put("code","-3");
            return json;
        }
        //获取团队长
@@ -639,8 +642,9 @@ public class PrenatalInspectorPreCardService extends BaseService {
        if (plans.size()>0){
            prenatalInspectorPlanDao.save(plans);
        }
        return preCard.getCode();
        json.put("code",preCard.getCode());
        json.put("list",plans);
        return json;
    }
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prenatalInspector/PrenatalController.java

@@ -32,8 +32,10 @@ public class PrenatalController extends BaseController{
    public String prenatalInspectorList(@ApiParam(name = "patient", value = "居民code", defaultValue = "d9de442323324a759ac82857c4692184")
                                        @RequestParam(value = "patient", required = true) String patient){
        try {
            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord(patient);
            return write(200, "查询成功！", "list", jsonArray);
            synchronized (patient.intern()){
                JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord(patient);
                return write(200, "查询成功！", "list", jsonArray);
            }
        }catch (Exception e){
            error(e);
            return error(-1,"查询失败");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prenatalInspector/PrenatalInspectorController.java

@@ -3,7 +3,9 @@ package com.yihu.wlyy.web.patient.prenatalInspector;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.patient.prenatal.PrenatalInspectorPlan;
import com.yihu.wlyy.entity.patient.prenatal.PrenatalInspectorPreCard;
import com.yihu.wlyy.repository.patient.PrenatalInspectorPlanDao;
import com.yihu.wlyy.service.app.prenatalInspector.PrenatalInspectorPreCardService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
 * Created by yeshijie on 2017/6/7.
 */
@@ -27,6 +31,8 @@ public class PrenatalInspectorController extends BaseController{
    @Autowired
    private PrenatalInspectorPreCardService preCardService;
    @Autowired
    private PrenatalInspectorPlanDao prenatalInspectorPlanDao;
    private ObjectMapper objectMapper = new ObjectMapper();
@@ -36,8 +42,8 @@ public class PrenatalInspectorController extends BaseController{
                             @RequestParam(value = "json", required = true) String json){
        try {
            PrenatalInspectorPreCard preCard = objectMapper.readValue(json,PrenatalInspectorPreCard.class);
            String code = preCardService.addPrenatalInspectorPreCard(preCard,getUID());
            JSONObject response = preCardService.addPrenatalInspectorPreCard(preCard,getUID());
            String code = response.getString("code");
            if("-1".equals(code)){
                return error(-1,"居民未签约，无法添加预建卡信息");
            }else if("-3".equals(code)){
@@ -48,6 +54,9 @@ public class PrenatalInspectorController extends BaseController{
            preCardService.saveHealthIndex(preCard,getRepUID());//保存体征数据
            String re = preCardService.uploadPreExam(code);//上传智业
            if(StringUtils.isNotBlank(re)){
                //上传失败。删除产检计划
                List<PrenatalInspectorPlan> plans = (List<PrenatalInspectorPlan>)response.get("list");
                prenatalInspectorPlanDao.delete(plans);
                return error(-1,re);
            }
            return success("预建卡保存成功！");
@@ -61,9 +70,11 @@ public class PrenatalInspectorController extends BaseController{
    @RequestMapping(value = "prenatalInspectorList", method = RequestMethod.POST)
    public String prenatalInspectorList(){
        try {
            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord(getUID());
            synchronized (getUID().intern()){
                JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord(getUID());
//            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord("d9de442323324a759ac82857c4692184");
            return write(200, "查询成功！", "list", jsonArray);
                return write(200, "查询成功！", "list", jsonArray);
            }
        }catch (Exception e){
            error(e);
            return error(-1,"查询失败");