产检和httplog修改

common/common-entity/src/main/java/com/yihu/wlyy/entity/httpLog/HttpLogDetail.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.service.entity.log;
package com.yihu.wlyy.entity.httpLog;
import com.yihu.wlyy.service.common.model.IdEntity;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrenatalInspectorController.java

@@ -25,14 +25,16 @@ public class PrenatalInspectorController extends BaseController{
    @RequestMapping(value = "getEhrMaternalFirstExamRecord",method = RequestMethod.POST)
    @ApiOperation("获取孕妇建卡信息")
    public Result getEhrMaternalFirstExamRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122,350204197512284026,222406198209202228")
    public Result getEhrMaternalFirstExamRecord(@ApiParam(name="idcard",value="身份证号",defaultValue = "352124761015122,350204197512284026,222406198209202228,35062719831211252X")
                                                @RequestParam(value = "idcard",required = true) String idcard,
                                                @ApiParam(name="hospital",value="医院code",defaultValue = "3502030500")
                                                @RequestParam(value = "hospital",required = false) String hospital) throws Exception
                                                @RequestParam(value = "hospital",required = false) String hospital,
                                                @ApiParam(name="pregnancyNo",value="产检号")
                                                @RequestParam(value = "pregnancyNo",required = false) String pregnancyNo) throws Exception
    {
        try {
            String re = maternalService.getEhrMaternalFirstExamRecord(idcard,hospital);
            String re = maternalService.getEhrMaternalFirstExamRecord(idcard,hospital,pregnancyNo);
            return Result.success("获取孕妇建卡信息成功！",re);
        } catch (Exception ex) {

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/LogService.java

@@ -146,14 +146,26 @@ public class LogService {
                log.setHeader(header);
                log.setParams(params);
                log.setCreateTime(new Date());
//                if(response.length()>10652261){
//                    log.setResponse("超过longtext限制");
//                }else {
//                    log.setResponse(response);
//                }
//                log.setError(error);
                log.setStatus(isSuccess?"1":"0");
                httpLogDao.save(log);
                //明细表
                HttpLogDetail detail = new HttpLogDetail();
                detail.setCode(log.getId());
                detail.setCreateTime(new Date());
                if(response.length()>10652261){
                    log.setResponse("超过longtext限制");
                    detail.setResponse("超过longtext限制");
                }else {
                    log.setResponse(response);
                    detail.setResponse(response);
                }
                log.setError(error);
                log.setStatus(isSuccess?"1":"0");
                httpLogDao.save(log);
                detail.setError(error);
                httpLogDetailDao.save(detail);
            }
        }
        catch (Exception ex)

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftMaternalService.java

@@ -30,7 +30,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
    /**
     * 7.32获取孕妇建卡信息(妇幼保健)
     */
    public String getEhrMaternalFirstExamRecord(String idcard,String hospitalCode) throws Exception
    public String getEhrMaternalFirstExamRecord(String idcard,String hospitalCode,String pregnancyNo) throws Exception
    {
        String[] hospitalMapping = getHospitalMapping(hospitalCode); //获取机构映射
        String hospital = hospitalMapping[0];
@@ -43,6 +43,7 @@ public class ZysoftMaternalService extends ZysoftBaseService{
        Map<String,String> params = new HashMap<>();
        params.put("ORG_CODE",hospital);
        params.put("IDENTITY_CARD_NO",idcard);
        params.put("PREGNANCY_NO",pregnancyNo);
        String response = postSecond("getEhrMaternalFirstExamRecord","获取孕妇建卡信息",params,null,header,false,1,"3");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/httplog/HttpLogDetailDao.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.service.dao.log;
package com.yihu.wlyy.repository.httplog;
import com.yihu.wlyy.service.entity.log.HttpLogDetail;
import com.yihu.wlyy.entity.httpLog.HttpLogDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -345,8 +345,9 @@ public class FamilyContractService extends BaseService {
        json.put("services", services);
        //是否签约上限
        int signLimit = signWebService.getSickFamilyDoctorSignLimit(doctor);
        json.put("signLimit", signLimit);
        JSONObject signLimit = signWebService.getSickFamilyDoctorSignLimit(doctor);
        json.put("signTotal",signLimit.getInt("signTotal"));//签约总数
        json.put("limitTotal",signLimit.getInt("limitTotal"));//限制总数
        return json;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -2621,13 +2621,15 @@ public class SignWebService extends BaseService {
     * @param doctorCode
     * @return
     */
    public Integer getSickFamilyDoctorSignLimit(String doctorCode){
        Integer re = 0;//0未达上线 1 已达上限
    public JSONObject getSickFamilyDoctorSignLimit(String doctorCode){
        JSONObject re = new JSONObject();//0未达上线 1 已达上限
        Integer signTotal = 0;
        Integer limitTotal = 0;
        List<AdminTeam> adminTeams = doctorAdminTeamMemberDao.findDoctorTeams(doctorCode);
        int limitNum = 0;
        for(AdminTeam one:adminTeams){
            //获取团队签约数
            Integer signCount = signFamilyDao.findByAdminTeamIdAndStatus(one.getId(),0);
            signTotal+=signCount;
            //获取智业团队签约上线
            String jwCode = one.getMappingCode();//智业服务团队的code
            try{
@@ -2637,18 +2639,15 @@ public class SignWebService extends BaseService {
                    com.alibaba.fastjson.JSONObject data = json.getJSONObject("data");
                    if("1".equals(data.getString("CODE"))){
                        int sign_limit_number = data.getJSONArray("DATA").getJSONObject(0).getInteger("SIGN_LIMIT_NUMBER");//签约上线
                        if(signCount>=sign_limit_number){
                            limitNum++;
                        }
                        limitTotal+=sign_limit_number;
                    }
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        if(adminTeams.size()==limitNum){
            re = 1;
        }
        re.put("signTotal",signTotal);
        re.put("limitTotal",limitTotal);
        return re;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/httplog/LogService.java

@@ -1,7 +1,9 @@
package com.yihu.wlyy.service.third.httplog;
import com.yihu.wlyy.entity.httpLog.HttpLog;
import com.yihu.wlyy.entity.httpLog.HttpLogDetail;
import com.yihu.wlyy.repository.httplog.HttpLogDao;
import com.yihu.wlyy.repository.httplog.HttpLogDetailDao;
import com.yihu.wlyy.service.system.SystemDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +19,8 @@ public class LogService {
    @Autowired
    private HttpLogDao httpLogDao;
    @Autowired
    private HttpLogDetailDao httpLogDetailDao;
    @Autowired
    private SystemDictService systemDictService;
@@ -42,11 +45,18 @@ public class LogService {
            log.setMethod(method);
            log.setParams(params);
            log.setCreateTime(new Date());
            log.setCreateTime(new Date());
            log.setResponse(response);
            log.setError(error);
//            log.setResponse(response);
//            log.setError(error);
            log.setStatus(isSuccess?"1":"0");
            httpLogDao.save(log);
            //明细表
            HttpLogDetail detail = new HttpLogDetail();
            detail.setCode(log.getId());
            detail.setCreateTime(new Date());
            detail.setResponse(response);
            detail.setError(error);
            httpLogDetailDao.save(detail);
        }
        catch (Exception ex)
        {
@@ -73,10 +83,18 @@ public class LogService {
                log.setHeader(header);
                log.setParams(params);
                log.setCreateTime(new Date());
                log.setResponse(response);
                log.setError(error);
//                log.setResponse(response);
//                log.setError(error);
                log.setStatus(isSuccess?"1":"0");
                httpLogDao.save(log);
                //明细表
                HttpLogDetail detail = new HttpLogDetail();
                detail.setCode(log.getId());
                detail.setCreateTime(new Date());
                detail.setResponse(response);
                detail.setError(error);
                httpLogDetailDao.save(detail);
            }
        }
        catch (Exception ex)

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

@@ -53,8 +53,8 @@ public class PrenatalInspectorContoller extends BaseController{
    @RequestMapping(value = "prenatalInspectorList", method = RequestMethod.POST)
    public String prenatalInspectorList(){
        try {
//            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord(getUID());
            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord("d9de442323324a759ac82857c4692184");
            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord(getUID());
//            JSONArray jsonArray = preCardService.getEhrMaternalFirstExamRecord("d9de442323324a759ac82857c4692184");
            return write(200, "查询成功！", "list", jsonArray);
        }catch (Exception e){
            error(e);
@@ -67,8 +67,8 @@ public class PrenatalInspectorContoller extends BaseController{
    public String getEhrMaternalFirstExamRecord(@ApiParam(name = "pregnancyNo", value = "产检号", defaultValue = "")
                                                @RequestParam(value = "pregnancyNo", required = true) String pregnancyNo){
        try {
//            JSONObject jsonObject = preCardService.firstExam(getUID(),pregnancyNo);
            JSONObject jsonObject = preCardService.firstExam("d9de442323324a759ac82857c4692184",pregnancyNo);
            JSONObject jsonObject = preCardService.firstExam(getUID(),pregnancyNo);
//            JSONObject jsonObject = preCardService.firstExam("d9de442323324a759ac82857c4692184",pregnancyNo);
            return write(200, "查询成功！", "data", jsonObject);
        }catch (Exception e){
            error(e);
@@ -81,8 +81,8 @@ public class PrenatalInspectorContoller extends BaseController{
    public String getEhrMaternalReExamRecord(@ApiParam(name = "pregnancyNo", value = "产检号", defaultValue = "")
                                             @RequestParam(value = "pregnancyNo", required = true) String pregnancyNo){
        try {
//            String response = preCardService.reExamRecode(getUID(),pregnancyNo);
            String response = preCardService.reExamRecode("d9de442323324a759ac82857c4692184",pregnancyNo);
            String response = preCardService.reExamRecode(getUID(),pregnancyNo);
//            String response = preCardService.reExamRecode("d9de442323324a759ac82857c4692184",pregnancyNo);
            return response;
        }catch (Exception e){
            error(e);
@@ -91,17 +91,6 @@ public class PrenatalInspectorContoller extends BaseController{
    }
    @ApiOperation("预建卡列表-孕检计划")
    @RequestMapping(value = "preCardList", method = RequestMethod.GET)
    public String preCardList(){