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

common/common-entity/src/main/java/com/yihu/wlyy/entity/device/PatientDevice.java

@@ -16,6 +16,8 @@ public class PatientDevice extends IdEntity {
	private Long deviceId;
	// 设备标识
	private String deviceSn;
	//sim卡号
	private String sim;
	// 设备名称
	private String deviceName;
	// 用户code
@@ -77,6 +79,15 @@ public class PatientDevice extends IdEntity {
		this.deviceSn = deviceSn;
	}
	@Column(name="sim")
	public String getSim() {
		return sim;
	}
	public void setSim(String sim) {
		this.sim = sim;
	}
	@Column(name="device_name")
	public String getDeviceName() {
		return deviceName;

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/entity/WlyyDevice.java

@@ -3,7 +3,6 @@ package com.yihu.wlyy.device.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
/**
@@ -30,6 +29,7 @@ public class WlyyDevice {
    private String applicantIdentity;//申请人身份证号
    private String applicantTel;//申请人手机
    private String applicantMail;//申请人邮箱
    private String sim;//sim卡号
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -184,6 +184,12 @@ public class WlyyDevice {
        this.applicantMail = applicantMail;
    }
    @Column(name = "sim")
    public String getSim() {
        return sim;
    }
    public void setSim(String sim) {
        this.sim = sim;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/WlyyPatientDevice.java

@@ -3,9 +3,7 @@ package com.yihu.wlyy.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
import java.util.Objects;
/**
 * Created by Administrator on 2016/12/7.
@@ -20,6 +18,7 @@ public class WlyyPatientDevice {
    private String categoryCode;
    private String deviceName;
    private String deviceSn;
    private String sim;
    private String userType;
    private String userIdcard;
    private Date czrq;
@@ -44,6 +43,15 @@ public class WlyyPatientDevice {
        this.deviceId = deviceId;
    }
    @Column(name = "sim")
    public String getSim() {
        return sim;
    }
    public void setSim(String sim) {
        this.sim = sim;
    }
    @Column(name = "user")
    public String getUser() {
        return user;

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_create.jsp

@@ -28,6 +28,12 @@
			<input type="text"  id="inp_deviceCode" class="required useTitle ajax f-w240 validate-special-char"  required-title="设备SN码不能为空"  data-attr-scan="deviceCode"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">设备SIM码</label>
		<div class="l-text-wrapper m-form-control">
			<input type="text"  id="inp_sim" class="useTitle ajax f-w240 validate-special-char" data-attr-scan="sim"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">厂家名称</label>
		<div class="l-text-wrapper m-form-control essential">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_create_js.jsp

@@ -29,6 +29,7 @@
					$("#inp_deviceName").ligerTextBox({width: 240})//设备名称
					$("#inp_deviceModel").ligerTextBox({width: 240})//设备型号
					$("#inp_deviceCode").ligerTextBox({width: 240})//设备唯一标识
					$("#inp_sim").ligerTextBox({width: 240})//设备sim码
					$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					$("#inp_address").ligerTextBox({width: 240})//厂家地址
					$("#inp_representative").ligerTextBox({width: 240})//法人代表
@@ -41,6 +42,7 @@
							{text: '三诺生物传感股份有限公司', id: 'threeNod'},
							{text: '深圳市优瑞恩科技有限公司', id: 'urion'},
							{text: '爱奥乐医疗器械（深圳）有限公司', id: 'bioland'} ,
							{text: '中兴云湃*脉搏波', id: 'yunpai'} ,
							{text: '康为血糖仪', id: 'comvee'}
						]
					});
@@ -69,6 +71,7 @@
									tel: data.tel,
									serverIp: data.serverIp,
									deviceName: data.deviceName,
									sim: data.sim,
									deviceModel: data.deviceModel,
									address: data.address,
									representative: data.representative,

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_list_js.jsp

@@ -68,8 +68,9 @@
							{display: 'ID', name: 'id', hide: true},
							{display: '设备名称', name: 'deviceName', width: '10%', align: "left"},
							{display: '型号', name: 'deviceModel', width: '10%', align: "left"},
							{display: 'SN码', name: 'deviceCode', width: '15%', align: "left"},
							{display: '机构名称', name: 'orgName', width: '15%', align: "left"},
							{display: 'SN码', name: 'deviceCode', width: '10%', align: "left"},
							{display: 'SIM码', name: 'sim', width: '10%', align: "left"},
							{display: '机构名称', name: 'orgName', width: '10%', align: "left"},
							{display: '联系人', name: 'linkman', width: '10%', align: "center"},
							{display: '联系电话', name: 'tel', width: '10%', align: "center"},
							//{display: '申请注册人', name: 'applicantName', width: '6%', align: "center"},

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_modify.jsp

@@ -36,6 +36,12 @@
			<input type="text"  id="inp_deviceCode" class="required useTitle ajax f-w240 validate-special-char"  required-title="设备SN码不能为空"  data-attr-scan="deviceCode"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">设备SIM码</label>
		<div class="l-text-wrapper m-form-control">
			<input type="text"  id="inp_sim" class="useTitle ajax f-w240 validate-special-char"  data-attr-scan="sim"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">厂家名称</label>
		<div class="l-text-wrapper m-form-control essential">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_modify_js.jsp

@@ -28,6 +28,7 @@
					$("#inp_deviceName").ligerTextBox({width: 240})//设备名称
					$("#inp_deviceModel").ligerTextBox({width: 240})//设备型号
					$("#inp_deviceCode").ligerTextBox({width: 240})//设备唯一标识
					$("#inp_sim").ligerTextBox({width: 240})//设备sim
					$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					$("#inp_address").ligerTextBox({width: 240})//厂家地址
					$("#inp_representative").ligerTextBox({width: 240})//法人代表
@@ -44,6 +45,7 @@
							{text: '三诺生物传感股份有限公司', id: 'threeNod'},
							{text: '深圳市优瑞恩科技有限公司', id: 'urion'},
							{text: '爱奥乐医疗器械（深圳）有限公司', id: 'bioland'} ,
                            {text: '中兴云湃*脉搏波', id: 'yunpai'} ,
							{text: '康为血糖仪', id: 'comvee'}
						]
					});
@@ -66,6 +68,7 @@
									tel: data.tel,
									serverIp: data.serverIp,
									deviceName: data.deviceName,
									sim: data.sim,
									deviceModel: data.deviceModel,
									deviceCode: data.deviceCode,
									address: data.address,

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/patientDevice_list_js.jsp

@@ -85,7 +85,8 @@
									return ""
								}
							},
							{display: '设备SN码', name: 'deviceSn', width: '15%', align: "left"},
							{display: '设备SN码', name: 'deviceSn', width: '10%', align: "left"},
							{display: '设备sim码', name: 'sim', width: '10%', align: "left"},
							{display: '居民姓名', name: 'userName', width: '10%', align: "center"},
							{
								display: '绑定按键', name: 'userType', width: '10%', align: "center",
@@ -103,7 +104,7 @@
								}
							},
							{display: '身份证号', name: 'userIdcard', width: '15%', align: "center"},
							{display: '创建日期', name: 'czrq', width: '15%', align: "center"},
							{display: '创建日期', name: 'czrq', width: '10%', align: "center"},
							{
								display: '操作', name: 'operator', width: '10%', align: "center", isSort: false,
								render: function (row) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/service/SignFamilyServiceDao.java

@@ -19,4 +19,6 @@ public interface SignFamilyServiceDao extends PagingAndSortingRepository<SignFam
    @Modifying
    @Query(" update SignFamilyService s set s.del=0 where s.signCode=?3 and s.serviceCode=?2 and s.patient=?1")
    void deletePatientService(String patientCode, String serviceCode, String signCode);
    SignFamilyService findByPatientAndSignCode(String patientCode, String code);
}

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/service/app/sign/SignFamilyServiceService.java

@@ -65,6 +65,12 @@ public class SignFamilyServiceService {
                errorPatient.add(patientCode);
                continue;
            }
            //判断患者的签约是否有该服务 有就不用添加服务
            SignFamilyService signFamilyServiceExsit = signFamilyServiceDao.findByPatientAndSignCode(patientCode,sgnFamily.getCode());
            if (signFamilyServiceExsit != null ) {
                errorPatient.add(patientCode);
                continue;
            }
            //添加服务
            SignFamilyService signFamilyService = new SignFamilyService();
            signFamilyService.setServiceCode(service.getCode());
@@ -114,9 +120,16 @@ public class SignFamilyServiceService {
        Service service = serviceDao.findByCode(serviceCode);
        List<ServiceItem> serviceItems = serviceItemDao.findByServiceCode(serviceCode);
        //判断患者是否有已经扣费的签约
        SignFamily sgnFamily = this.getSignFamily(patient);
        if (sgnFamily == null || sgnFamily.getNum() == 0 || sgnFamily.getNum() == null) {
          return false;
        }
        //判断患者的签约是否有该服务 有就不用添加服务
        SignFamilyService signFamilyServiceExsit = signFamilyServiceDao.findByPatientAndSignCode(patient,sgnFamily.getCode());
        if (signFamilyServiceExsit != null ) {
            return false;
        }
        //添加服务
        SignFamilyService signFamilyService = new SignFamilyService();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -3915,33 +3915,64 @@ public class StatisticsESService {
     * @param type    1.自取，2.快递配送，3.健管师配送
     * @return
     */
    public List<Map<String, Object>> getPrescriptionDispatchingHistogram(int level, String area, String disease, String type) throws Exception {
        String index62 = "62";//统计长处方配送方式和疾病维度
        String index67 = "67";//统计长处方配送方式维度
    public List<Map<String, Object>> getPrescriptionDispatchingHistogram(int level, String area, String disease, String type,int interval) throws Exception {
        //统计长处方配送方式和疾病维度
        String index62 = "62";
        //统计长处方配送方式维度
        String index67 = "67";
        String startTime = "";
        String endTime = "";
        List<Map<String, Object>> rs = new ArrayList<>();
        Calendar dd = Calendar.getInstance();//定义日期实例
        //定义日期实例
        Calendar dd = Calendar.getInstance();
        Date endDate = new Date();
        dd.setTime(endDate);
        for (int i = 1; i < 7; i++) {
            Map<String, Object> mc = new HashedMap();
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
            String date = sdf.format(dd.getTime());
            mc.put("month", date);
            mc.put("count", 0.0D);
            dd.add(Calendar.MONTH, -1);
            rs.add(mc);
        //六个月前的开始时间
        Date startDate = DateUtil.getNextMonthReturnDate(endDate,-6);
        if (interval==1){
            rs = DateUtil.findDates(startDate,endDate);
            //加入当天数据
            Map<String,Object> dateMap = new HashedMap();
            dateMap.put("date",dateFormat.format(endDate));
            dateMap.put("avg",0);
            dateMap.put("count", 0.0D);
            rs.add(dateMap);
        }
        if (interval==2){
            rs = DateUtil.findDateASWeeks(startDate,endDate);
            String MondayWeekDateStr = DateUtil.getMondayOfThisDate(startDate);
            Date MondayWeekDate = dateFormat.parse(MondayWeekDateStr);
            if (startDate.compareTo(MondayWeekDate)==1){
                //开始时间不是当周的周一，则加入本周周一的时间
                Map<String,Object> dateMap = new HashedMap();
                dateMap.put("date",MondayWeekDateStr);
                dateMap.put("avg",0);
                dateMap.put("count", 0.0D);
                rs.add(0,dateMap);
            }
            startTime = dateFormat.format(startDate);
            endTime = dateFormat.format(endDate);
        }else if (interval==3){
            for (int i = 1; i < 7; i++) {
                Map<String, Object> mc = new HashedMap();
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
                String date = sdf.format(dd.getTime());
                mc.put("month", date);
                mc.put("count", 0.0D);
                dd.add(Calendar.MONTH, -1);
                rs.add(mc);
            }
            startTime = DateUtil.dateToStr(dd.getTime(), "YYYY-MM-dd HH:mm:ss");
            endTime = DateUtil.dateToStr(new Date(), "YYYY-MM-dd HH:mm:ss");
        }
        String startTime = DateUtil.dateToStr(dd.getTime(), "YYYY-MM-dd HH:mm:ss");
        String endTime = DateUtil.dateToStr(new Date(), "YYYY-MM-dd HH:mm:ss");
        List<SaveModel> resultList = new ArrayList<>();
        if (StringUtils.isNotBlank(disease)) {
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(startTime, endTime, area, level, index62, SaveModel.timeLevel_ZL, SaveModel.interval_month, type,disease);
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(startTime, endTime, area, level, index62, SaveModel.timeLevel_ZL, String.valueOf(interval), type,disease);
        } else {
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(startTime, endTime, area, level, index67, SaveModel.timeLevel_ZL, SaveModel.interval_month, type);
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(startTime, endTime, area, level, index67, SaveModel.timeLevel_ZL, String.valueOf(interval), type);
        }
        for (Map<String, Object> m : rs) {
@@ -3949,9 +3980,16 @@ public class StatisticsESService {
            while (iterator.hasNext()) {
                SaveModel saveModel = (SaveModel) iterator.next();
                if (saveModel.getQuotaDate() != null) {
                    String monthKey = (String) m.get("month");
                    String monthKeyEs = DateUtil.changeQuotaDate(saveModel.getQuotaDate());
                    if (monthKey.equals(monthKeyEs)) {
                    String key = "";
                    String EsKey ="";
                    if (interval != 3){
                        key=String.valueOf(m.get("date"));
                        EsKey = DateUtil.dateToStr(saveModel.getQuotaDate(),"yyyy-MM-dd");
                    }else {
                        key=String.valueOf(m.get("month"));
                        EsKey = DateUtil.changeQuotaDate(saveModel.getQuotaDate());
                    }
                    if (key.equals(EsKey)) {
                        m.put("count", saveModel.getResult2());
                    }
                }
@@ -4628,6 +4666,17 @@ public class StatisticsESService {
        return jo;
    }
    /**
     * 线上缴费的情况
     * @param area
     * @param level
     * @param index
     * @param sort
     * @param lowLevel
     * @param year
     * @return
     * @throws Exception
     */
    public JSONArray getLowLevelSignPayOnline(String area, int level, String index, int sort, String lowLevel, String year) throws Exception {
        String timeKey = "";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/DateUtil.java

@@ -907,6 +907,7 @@ public class DateUtil {
		Map<String,Object> st = new HashedMap();
		st.put("date",DateUtil.dateToStr(dBegin,"yyyy-MM-dd"));
		st.put("avg",0);
		st.put("count", 0);
		lDate.add(st);
		Calendar calBegin = Calendar.getInstance();
@@ -927,6 +928,7 @@ public class DateUtil {
			Map<String,Object> stt = new HashedMap();
			stt.put("date",DateUtil.dateToStr(calBegin.getTime(),"yyyy-MM-dd"));
			stt.put("avg",0);
			stt.put("count", 0);
			lDate.add(stt);
		}
		return lDate;
@@ -943,6 +945,7 @@ public class DateUtil {
			Map<String,Object> st = new HashedMap();
			st.put("date",DateUtil.dateToStr(dBegin,"yyyy-MM-dd"));
			st.put("avg",0);
			st.put("count",0);
			lDate.add(st);
		}
@@ -954,13 +957,17 @@ public class DateUtil {
		while (dEnd.after(calBegin.getTime())) {
			// 根据日历的规则，为给定的日历字段添加或减去指定的时间量
			calBegin.add(Calendar.DAY_OF_MONTH, 1);
			if(!dEnd.after(calBegin.getTime())){
			/*if(!dEnd.after(calBegin.getTime())){
				break;
			}*/
			if (dEnd.compareTo(calBegin.getTime())==-1){
				break;
			}
			if(checkDateMonday(calBegin)){
				Map<String,Object> stt = new HashedMap();
				stt.put("date",DateUtil.dateToStr(calBegin.getTime(),"yyyy-MM-dd"));
				stt.put("avg",0);
				stt.put("count",0);
				lDate.add(stt);
			}
		}
@@ -1114,4 +1121,35 @@ public class DateUtil {
		return new SimpleDateFormat(YYYY_MM).format(date);
	}
	/**
	 * 获取周一
	 * @return
	 */
	public static String getMondayOfThisDate(Date date) {
		SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd");
		Calendar c = Calendar.getInstance();
		c.setTime(date);
		int day_of_week = c.get(Calendar.DAY_OF_WEEK) - 1;
		if (day_of_week == 0)
			day_of_week = 7;
		c.add(Calendar.DATE, -day_of_week + 1);
		return df2.format(c.getTime());
	}
	/**
	 * 得到本周周日
	 *
	 * @return yyyy-MM-dd
	 */
	public static String getSundayOfThisDate(Date date) {
		SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd");
		Calendar c = Calendar.getInstance();
		c.setTime(date);
		int day_of_week = c.get(Calendar.DAY_OF_WEEK) - 1;
		if (day_of_week == 0)
			day_of_week = 7;
		c.add(Calendar.DATE, -day_of_week + 7);
		return df2.format(c.getTime());
	}
}

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,"查询失败");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/EsStatisticsController.java

@@ -1841,9 +1841,10 @@ public class EsStatisticsController extends BaseController {
    public String getPrescriptionDispatchingHistogram(@ApiParam(name="level", value="级别") @RequestParam(required = true)String level,
                                                      @ApiParam(name="area", value="级别编码") @RequestParam(required = true)String area,
                                                      @ApiParam(name="disease", value="疾病") @RequestParam(required = false)String disease,
                                                      @ApiParam(name="type", value="1.自取，2.快递配送，3.健管师配送") @RequestParam(required = true)String type){
                                                      @ApiParam(name="type", value="1.自取，2.快递配送，3.健管师配送") @RequestParam(required = true)String type,
                                                      @ApiParam(name="interval",value ="时间类型：1日2周3月")@RequestParam(required = false,defaultValue = "1")int interval){
        try{
            return write(200, "查询成功", "data", statisticsESService.getPrescriptionDispatchingHistogram(elasticsearchUtil.changeLevel(Integer.valueOf(level)),area,disease,type));
            return write(200, "查询成功", "data", statisticsESService.getPrescriptionDispatchingHistogram(elasticsearchUtil.changeLevel(Integer.valueOf(level)),area,disease,type,interval));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
@@ -2017,8 +2018,7 @@ public class EsStatisticsController extends BaseController {
            if (org.springframework.util.StringUtils.isEmpty(year)) {
                year = Constant.getNowYear();
            }
            result.put("data" , statisticsESService.getSignPayOnline(elasticsearchUtil.changeLevel(level),area,year));
            return write(200, "查询成功", "data", result);
            return write(200, "查询成功", "data", statisticsESService.getSignPayOnline(elasticsearchUtil.changeLevel(level),area,year));
        }catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");