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

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ChargeZYService.java

@@ -225,7 +225,10 @@ public class ChargeZYService {
                //--huangwenjie--2018.01.12--扣费总额需要扣除政府补贴
                if(StringUtils.isNotBlank(charge.getCadresPay())){
                    infoobj.put("zfbtzf", NumberUtil.feeToYuan(Integer.parseInt(charge.getCadresPay().trim())));//政府补贴支付
    
                    System.out.println("totailAmount:"+String.valueOf(charge.getTotalAmount()));
                    System.out.println("cadrespay:"+charge.getCadresPay().trim());
                    Integer totalAmount = charge.getTotalAmount() - Integer.parseInt(charge.getCadresPay().trim());
                    System.out.println(String.valueOf(totalAmount));
                    infoobj.put("zje000",NumberUtil.feeToYuan(charge.getTotalAmount()-Integer.parseInt(charge.getCadresPay().trim())));//扣费总额
                }else{
                    infoobj.put("zfbtzf","0.00");//政府补贴支付

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildInfoService.java

@@ -114,6 +114,7 @@ public class ChildInfoService extends BaseService {
		vo.setMotherName(c.getMotherName());
		vo.setMotherSsc(c.getMotherSsc());
		vo.setSex(c.getSex());
		vo.setSsc(c.getSsc());
		return vo;
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/ImmuneService.java

@@ -501,6 +501,25 @@ public class ImmuneService {
				V_RESERVATION_IMMUNE_JSON.put("ID_CARD", ID_CARD.getTextTrim());
				V_RESERVATION_IMMUNE_JSON.put("RES_ID", RES_ID.getTextTrim());
				V_RESERVATION_IMMUNE_JSON.put("BARCODE", BARCODE.getTextTrim());
				
				//组装预约时间给前端调用：取消预约用
				String START_TIME_VO = RES_DATE.getTextTrim()+" "+START_TIME.getTextTrim();
				V_RESERVATION_IMMUNE_JSON.put("START_TIME_VO",START_TIME_VO);
				
				//组装坐诊类型给前端调用：取消预约用
				Date date = DateUtil.strToDate(START_TIME_VO+":00");
				GregorianCalendar cal= new GregorianCalendar();
				cal.setTime(date);
				int AM_PM = cal.get(GregorianCalendar.AM_PM);
				String SectionType = "";
				if(0 == AM_PM){
					SectionType = "AM";
				}
				if(1 == AM_PM){
					SectionType = "PM";
				}
				V_RESERVATION_IMMUNE_JSON.put("SectionType",SectionType);
				
				result.add(V_RESERVATION_IMMUNE_JSON);
			}
			

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java

@@ -255,7 +255,7 @@ public class PatientBookingController extends WeixinBaseController{
    @ResponseBody
    @ObserverRequired
    @ApiOperation("计免：根据条形码获取预约记录")
    public String UnResRegisterImmune (@ApiParam(name="BarCode",value="新生儿条形编码",defaultValue = "")
    public String GetResImmuneListWithBarCode (@ApiParam(name="BarCode",value="新生儿条形编码",defaultValue = "")
                                       @RequestParam String BarCode){
        
        try{

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -485,25 +485,21 @@ public class FamilyMemberController extends WeixinBaseController {
    public String addImmuneMenberByBarCode(@ApiParam(name = "barCode", value = "新生儿条形编码", defaultValue = "")
                                           @RequestParam(value = "barCode", required = true) String barCode,
                                           @ApiParam(name = "idcard", value = "新生儿身份证号", defaultValue = "")
                                           @RequestParam(value = "idcard", required = true) String idcard,
                                           @RequestParam(value = "idcard", required = false) String idcard,
                                           @ApiParam(name = "ssc", value = "新生儿条形编码", defaultValue = "")
                                           @RequestParam(value = "ssc", required = true) String ssc,
                                           @RequestParam(value = "ssc", required = false) String ssc,
                                           @ApiParam(name = "relation", value = "1父亲 2母亲 3老公 4老婆 5儿子 6女儿 7其他")
                                           @RequestParam(value = "relation", required = true) Integer relation){
        try {
    
            ChildInfo childInfo  = childInfoService.getByBarCode(barCode);
            
            if(StringUtils.isBlank(idcard) || StringUtils.isBlank(ssc)){
                return error(-1, "新生儿身份证和社保卡号不能为空！");
            }
            
            if(!idcard.equals(childInfo.getIdcard()) && StringUtils.isNotBlank(childInfo.getIdcard())){
                return error(-1, "新生儿身份证信息不一致，无法绑定");
                return error(-1, "输入的新生儿身份证信息不一致，无法绑定");
            }
    
            if(!ssc.equals(childInfo.getSsc()) && StringUtils.isNotBlank(childInfo.getSsc())){
                return error(-1, "新生儿身份证信息不一致，无法绑定");
                return error(-1, "输入的新生儿社保卡不一致，无法绑定");
            }
    
            childFamilyImmuneService.addFamilyMembers(childInfo,getRepUID(),idcard,ssc,relation);